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)
commit695d82fae9160406acb9de204c471248abcc2a9f
tree1a3b3f48e3e0d1783fc75fa50dc77b41a1a88b88
parent74c46469a5f70a29ac961cfaa90a0422f1d09230
parent1dde9f75b658edcd4fb7e00259206d727702ce61
Merge tag 'imx25-iomux-ds' of git://git.pengutronix.de/git/imx/linux-2.6 into next/fixes-non-critical

* 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>
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/pm.c