]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mfd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 05:32:39 +0000 (15:32 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 05:32:39 +0000 (15:32 +1000)
commit625381f687ae17bf9b34c42ac40c210fdc38344b
tree9ccd63a0d7ace7a96d8a1057b71f2cac5b71d80f
parent3f2c7c6a9945c941d28fd16538f57c95dc4d8316
parent5024a87220807776121a4fbe53fdb3648faaea58
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
drivers/mfd/88pm860x-core.c
drivers/mfd/tc3589x.c
Documentation/devicetree/bindings/regulator/tps6586x.txt
drivers/mfd/Kconfig
drivers/regulator/ab3100.c