]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mfd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 02:48:19 +0000 (13:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 02:48:19 +0000 (13:48 +1100)
commit9336675fb823501ac2166fa0f23d81948f885e69
tree220efacb6363431e60a095da4bdb40ba25d73cbe
parent5941a7a3786dae1320b7474409aaf1dedba3c78c
parent38d25d4af5caf7c33f4c6bcb4549407ecc5527b4
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
arch/arm/mach-u300/include/mach/irqs.h
16 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
drivers/mfd/wm8994-core.c
include/linux/mfd/wm8994/core.h