]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'regulator-drivers' into regulator-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Aug 2012 19:07:15 +0000 (20:07 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Aug 2012 19:07:15 +0000 (20:07 +0100)
commitf110340d61197669ff5efca137278e1fef1c411d
treebb0358a1ebe6b3a3ebeb3af3af4c7ef93c266b11
parent7ad89ec1725c7b787ca11593ae9330471a794243
parentb93fffbb5f7227a45db30d10589ac0c28e6011fe
Merge branch 'regulator-drivers' into regulator-next

Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
Documentation/devicetree/bindings/regulator/tps6586x.txt
drivers/regulator/tps6586x-regulator.c