]> 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, 3 Oct 2012 04:12:00 +0000 (14:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 04:12:00 +0000 (14:12 +1000)
commit341cf15c557773166dd350b6cb2f4ad765123b05
tree954390a3590eb5be49aac13d12ba87a8fb3e36b4
parentaba82d1e01412371e13478d26689e031594551f6
parent74d8378159de16a0a1d1975d4778120d263d6000
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
drivers/mfd/88pm860x-core.c
drivers/mfd/db8500-prcmu.c
drivers/mfd/max8925-core.c
drivers/mfd/tc3589x.c
drivers/mfd/tps65217.c
drivers/regulator/anatop-regulator.c
drivers/video/backlight/88pm860x_bl.c
23 files changed:
Documentation/devicetree/bindings/regulator/tps6586x.txt
arch/arm/boot/dts/imx6q.dtsi
arch/arm/boot/dts/pxa910.dtsi
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-omap2/usb-host.c
arch/arm/mach-u300/i2c.c
arch/arm/plat-omap/include/plat/usb.h
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/mfd/Kconfig
drivers/mfd/rc5t583.c
drivers/mfd/tps6586x.c
drivers/mfd/twl-core.c
drivers/pwm/Kconfig
drivers/regulator/Kconfig
drivers/regulator/ab3100.c
drivers/regulator/anatop-regulator.c
drivers/regulator/palmas-regulator.c
drivers/regulator/wm831x-dcdc.c
drivers/regulator/wm831x-ldo.c
include/linux/mfd/tps6586x.h
include/linux/mfd/twl6040.h