]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mfd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 02:39:04 +0000 (12:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 02:39:04 +0000 (12:39 +1000)
commit9d363b6b9ad4f7de490855645931bb806ed679ae
tree97c6d2f386e70283dab4f7f750e2a3cd13f0ed60
parentf608d15cdfac7e0b1ad7351264b725b5b4e974f2
parent396f70be54f026a6601012a73db87dc75c6d8f1d
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
drivers/mfd/88pm860x-core.c
drivers/mfd/max8925-core.c
drivers/mfd/tc3589x.c
drivers/mfd/tps65217.c
drivers/regulator/anatop-regulator.c
Documentation/devicetree/bindings/regulator/tps6586x.txt
arch/arm/mach-imx/mach-imx6q.c
drivers/gpio/Kconfig
drivers/mfd/Kconfig
drivers/pwm/Kconfig
drivers/regulator/ab3100.c
drivers/regulator/anatop-regulator.c
drivers/regulator/palmas-regulator.c
drivers/regulator/wm831x-ldo.c