git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7f05cc9
cb47008
)
Merge remote-tracking branch 'asoc/topic/component' into asoc-core
author
Mark Brown
<broonie@linaro.org>
Tue, 17 Sep 2013 12:25:28 +0000
(13:25 +0100)
committer
Mark Brown
<broonie@linaro.org>
Tue, 17 Sep 2013 12:25:28 +0000
(13:25 +0100)
Conflicts:
include/sound/soc.h
Trivial merge