]> 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, 26 Sep 2012 02:51:52 +0000 (12:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 02:51:52 +0000 (12:51 +1000)
commit3fe5cf5760f780dbdf845a9962ce0390f1c8a544
tree805bf7678426f5854e6ba06624fbc0644d3cf492
parent8f70c68d0b9e508603f9b91617e1af7688994a10
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