]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regulator/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 02:37:38 +0000 (12:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 02:37:38 +0000 (12:37 +1000)
commitb144327e68715753c0e840e89c62f6439a4a18cd
tree99f53bca253bb05dea98b37f3689dcaf8c356e59
parentf8b3b7f2f49efcee20d589485b24b47b12b8e245
parentbe9bfd9881581ff7a1fe08bce286d3c9b2aa40d9
Merge remote-tracking branch 'regulator/for-next'

Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
Documentation/devicetree/bindings/regulator/tps6586x.txt
drivers/mfd/tps6586x.c
drivers/regulator/Kconfig
drivers/regulator/ab3100.c
drivers/regulator/wm831x-dcdc.c
drivers/regulator/wm831x-ldo.c
include/linux/mfd/tps6586x.h