]> 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, 13 Oct 2011 02:50:08 +0000 (13:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 02:50:08 +0000 (13:50 +1100)
commit81c80ae896f5115479f7e75a5423ae5473feb60d
tree33676e5888cddd7103c77a57081386bd08f7027f
parentfc808f8fab323f74f9066174be6d7c1fe005269d
parent5b3dcb3d8cbdbf3e927e05ad7b0dfe45e44d84e9
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
arch/arm/mach-imx/mach-mx31moboard.c
arch/arm/mach-u300/include/mach/irqs.h
19 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/Kconfig
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-u300/include/mach/irqs.h
arch/arm/mach-ux500/board-u5500.c
arch/arm/mach-ux500/cpu.c
drivers/cpufreq/db8500-cpufreq.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