git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1a39019
b37f1d1
)
Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...
author
Mark Brown
<broonie@linaro.org>
Mon, 14 Apr 2014 16:42:28 +0000
(17:42 +0100)
committer
Mark Brown
<broonie@linaro.org>
Mon, 14 Apr 2014 16:42:28 +0000
(17:42 +0100)
Conflicts:
sound/soc/soc-core.c
Trivial merge