]> 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, 19 Sep 2012 02:25:47 +0000 (12:25 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 02:25:47 +0000 (12:25 +1000)
commit2c09d5c61285b960f3a802bab083e47850c1b57f
tree90826ce27830cbf708d5348b4da694f2f99ededb
parentd6df84436075b5d4bed81c41eea95714166029ec
parent4adcefd3f908f02a5266cb37d82dc34615edbd3b
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
drivers/mfd/88pm860x-core.c
drivers/mfd/tc3589x.c
drivers/regulator/anatop-regulator.c
Documentation/devicetree/bindings/regulator/tps6586x.txt
arch/arm/mach-imx/mach-imx6q.c
drivers/mfd/Kconfig
drivers/regulator/ab3100.c
drivers/regulator/anatop-regulator.c