]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regulator/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 05:44:37 +0000 (15:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 05:44:37 +0000 (15:44 +1000)
commit2d38d9557211c4b4e3977dc6be72bd0f30f583ea
tree8793b038dd5b83a20207952bb019421ea141fc89
parentf6604436b74b8ff831b9dc156b19cb1d098ced3f
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