]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mfd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 03:32:39 +0000 (14:32 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 03:32:39 +0000 (14:32 +1100)
commitccbdd3a19c65a1f7a3e407e8a58d436944785f96
treea9817bb090715db7a5f382ccef1dc90051b85868
parentd84dcb1f4bdd6a7ba7659695557342b797a97452
parentde1dd6938782987895c8f061498a144c03398197
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
arch/arm/mach-u300/include/mach/irqs.h
14 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
arch/arm/mach-u300/include/mach/irqs.h
arch/arm/mach-ux500/board-u5500.c
drivers/gpio/Kconfig
drivers/i2c/busses/Kconfig
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
drivers/mfd/menelaus.c