git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
88a8fe3
e73f3de
)
Merge remote-tracking branch 'asoc/fix/debugfs' into asoc-component
author
Mark Brown
<broonie@linaro.org>
Sat, 28 Jun 2014 12:55:22 +0000
(13:55 +0100)
committer
Mark Brown
<broonie@linaro.org>
Sat, 28 Jun 2014 13:47:12 +0000
(14:47 +0100)
Conflicts:
sound/soc/soc-core.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff