]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regulator/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 03:19:39 +0000 (13:19 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 03:19:39 +0000 (13:19 +1000)
commit18ba98da9ad81598b7189ffd8fc9d771ca956d0d
treee36d14d699ff18ffdd056e2143e5dc1802ae87b5
parent8dc300128a79f6333ac9c9b696db072c8bd4d27b
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/palmas-regulator.c
drivers/regulator/wm831x-dcdc.c
drivers/regulator/wm831x-ldo.c
include/linux/mfd/tps6586x.h