]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regulator/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 03:44:29 +0000 (13:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 03:44:29 +0000 (13:44 +1000)
commit810e788f660e440b076e68e38eb5f1cd5cd4d869
tree368045c60f682d08fb1be1472228aa0d43ef32bd
parent75d1c98247b840c8ef6a96abf70e5855b2ec37f8
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/ab3100.c
drivers/regulator/wm831x-dcdc.c
drivers/regulator/wm831x-ldo.c
include/linux/mfd/tps6586x.h