]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mfd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Sep 2012 03:34:29 +0000 (13:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Sep 2012 03:34:29 +0000 (13:34 +1000)
commit3f35bb1e879ad78ffc09923672ab4353815b98f3
tree5cfdd563fe42bb774c3221f1c015c6a972614c85
parentb7d2fdb4795f6ce1fbf03fb599cae8dfd5cc954c
parent0beac78bb350ee2f8478310013c18b5ad8498cb5
Merge remote-tracking branch 'mfd/for-next'

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