git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d6f8337
5b01bd1
)
Merge remote-tracking branch 'regulator/fix/palmas' into regulator-palmas
author
Mark Brown
<broonie@linaro.org>
Tue, 24 Jun 2014 11:20:11 +0000
(12:20 +0100)
committer
Mark Brown
<broonie@linaro.org>
Tue, 24 Jun 2014 11:20:11 +0000
(12:20 +0100)
Conflicts:
drivers/regulator/palmas-regulator.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff