]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mfd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 02:45:56 +0000 (12:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 02:45:56 +0000 (12:45 +1000)
commitfda67ae29fb51f9b0645ef8ec7c4b712e0abaa30
treef0af546cc4c9c15f128682231313514a8378b584
parent397fea8e70eaf08e2074925bc240051a979f078d
parent8df57be19605d749e33c14642bd232ed7626c9e0
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
drivers/mfd/max8997.c
12 files changed:
arch/arm/mach-imx/mach-mx27_3ds.c
arch/arm/mach-imx/mach-mx31_3ds.c
arch/arm/mach-imx/mach-mx31lite.c
arch/arm/mach-imx/mach-mx31moboard.c
arch/arm/mach-imx/mach-pcm038.c
arch/arm/mach-mx5/mx51_efika.c
arch/arm/mach-omap2/board-omap3beagle.c
drivers/gpio/Kconfig
drivers/i2c/busses/Kconfig
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
drivers/mfd/menelaus.c