]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fixes' into for-next
authorOlof Johansson <olof@lixom.net>
Sun, 9 Jun 2013 18:44:42 +0000 (11:44 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 9 Jun 2013 18:44:42 +0000 (11:44 -0700)
* fixes:
  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

1  2 
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/omap5.dtsi

Simple merge
Simple merge