git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5957e44
0cdfcc0
)
Merge remote-tracking branch 'regulator/topic/devm' into regulator-palmas
author
Mark Brown
<broonie@linaro.org>
Mon, 16 Sep 2013 23:34:28 +0000
(
00:34
+0100)
committer
Mark Brown
<broonie@linaro.org>
Mon, 16 Sep 2013 23:34:28 +0000
(
00:34
+0100)
Conflicts:
drivers/regulator/palmas-regulator.c
Trivial merge