Merge tag 'imx25-iomux-ds' of git://git.pengutronix.de/git/imx/linux-2.6 into next...
authorArnd Bergmann <arnd@arndb.de>
Thu, 15 Mar 2012 13:49:36 +0000 (13:49 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Mar 2012 13:49:42 +0000 (13:49 +0000)
* tag 'imx25-iomux-ds' of git://git.pengutronix.de/git/imx/linux-2.6:
   iomux-mx25.h slew rate adjusted for LCD __LD pins

(update to v3.3-rc6)

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/pm.c

Simple merge
Simple merge
Simple merge
Simple merge