git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
83c0929
4890140
)
Merge branch 'topic/codec-dapm' of git://git.kernel.org/pub/scm/linux/kernel/git...
author
Mark Brown
<broonie@kernel.org>
Tue, 7 Jul 2015 14:04:40 +0000
(15:04 +0100)
committer
Mark Brown
<broonie@kernel.org>
Tue, 7 Jul 2015 14:04:40 +0000
(15:04 +0100)
Conflicts:
sound/soc/codecs/rt5645.c
Trivial merge