git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
13b02fa
95169d0
)
Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-new-pcm
author
Mark Brown
<broonie@linaro.org>
Mon, 5 Aug 2013 17:12:39 +0000
(18:12 +0100)
committer
Mark Brown
<broonie@linaro.org>
Mon, 5 Aug 2013 17:12:39 +0000
(18:12 +0100)
Trivial add/add conflicts:
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff