git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b968d83
64aa5f5
)
Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-fsl
author
Mark Brown
<broonie@kernel.org>
Thu, 8 Jan 2015 19:54:56 +0000
(19:54 +0000)
committer
Mark Brown
<broonie@kernel.org>
Thu, 8 Jan 2015 19:54:56 +0000
(19:54 +0000)
Conflicts:
sound/soc/fsl/fsl_ssi.c
Trivial merge