git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dfe1951
cffd666
)
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
author
Mark Brown
<broonie@linaro.org>
Tue, 13 May 2014 17:23:56 +0000
(18:23 +0100)
committer
Mark Brown
<broonie@linaro.org>
Tue, 13 May 2014 17:23:56 +0000
(18:23 +0100)
Conflicts:
sound/soc/intel/sst-baytrail-dsp.c
Trivial merge