git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d1c3f7c
9839d62
)
Merge remote-tracking branch 'regulator/topic/sky81452' into regulator-drivers
author
Mark Brown
<broonie@kernel.org>
Sun, 28 Sep 2014 11:17:00 +0000
(12:17 +0100)
committer
Mark Brown
<broonie@kernel.org>
Sun, 28 Sep 2014 11:17:00 +0000
(12:17 +0100)
Conflicts:
drivers/regulator/Kconfig
drivers/regulator/Makefile
Trivial merge