]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regulator/topic/devm' into regulator-palmas
authorMark Brown <broonie@linaro.org>
Mon, 16 Sep 2013 23:34:28 +0000 (00:34 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 16 Sep 2013 23:34:28 +0000 (00:34 +0100)
commitd0175e7e78ef6dddf13a67f968332b3e44a5995d
tree885cb99021f6d16a3cbc400405654223e8359731
parent5957e444d2aa01705749190c32ae88fc4a029156
parent0cdfcc0f9352a4c076fbb51299e2b12a35619a51
Merge remote-tracking branch 'regulator/topic/devm' into regulator-palmas

Conflicts:
drivers/regulator/palmas-regulator.c
drivers/regulator/palmas-regulator.c