]> 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, 25 Jul 2012 01:18:47 +0000 (11:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 01:18:47 +0000 (11:18 +1000)
commit664a28373aca4bfb4fb139f6d5b54d5a980f8342
treecab0c02850828700dccdb39c4011b7124cdbfff2
parentbbf33c1743b98b1fb881cc651962b56630726b58
parent78948c17a47cc56cb10667f59036b6a703147161
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
arch/arm/configs/tegra_defconfig
drivers/mfd/mc13xxx-spi.c
drivers/regulator/s5m8767.c
include/linux/mfd/s5m87xx/s5m-core.h
15 files changed:
Documentation/devicetree/bindings/mfd/tps65910.txt
MAINTAINERS
arch/arm/configs/tegra_defconfig
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-origen.c
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/cpu-db8500.c
drivers/gpio/Kconfig
drivers/input/misc/ab8500-ponkey.c
drivers/regulator/Kconfig
drivers/regulator/ab8500.c
drivers/regulator/s5m8767.c
include/linux/mfd/abx500/ab8500.h
include/linux/mfd/tps65910.h
sound/soc/codecs/twl6040.c