diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-09 18:44:17 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-09 18:44:17 (GMT) |
| commit | f1d6e31de103a573064a7ff158a8de0170f8fe34 (patch) | |
| tree | a9f8c9ab28f4a2680661fe8b33e59d9f86f42f9b /arch/arm/mach-prima2/rstc.c | |
| parent | 090878aa951628143f40a1acc19ec074a5ae9200 (diff) | |
| parent | 03c0d27119296bb32ef4a075b9fb8bb0aeaa19c0 (diff) | |
| download | linux-f1d6e31de103a573064a7ff158a8de0170f8fe34.tar.xz | |
Merge tag 'omap-for-v3.10/fixes-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren, a set of small fixes for omaps for the -rc cycle:
- am7303 iva2 reset PM regression fix
- am33xx uart2 dma channel fix
- am33xx gpmc properties fix
- omap44xx rtc wake-up mux fix for nirq pins
- omap36xx clock divider restore fix
There's also one tiny non-critical .dts fix for omap5
timer pwm properties.
* tag 'omap-for-v3.10/fixes-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: omap3: clock: fix wrong container_of in clock36xx.c
ARM: dts: OMAP5: Fix missing PWM capability to timer nodes
ARM: dts: omap4-panda|sdp: Fix mux for twl6030 IRQ pin and msecure line
ARM: dts: AM33xx: Fix properties on gpmc node
arm: omap2: fix AM33xx hwmod infos for UART2
ARM: OMAP3: Fix iva2_pwrdm settings for 3703
Diffstat (limited to 'arch/arm/mach-prima2/rstc.c')
0 files changed, 0 insertions, 0 deletions