git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e948262
5c2b063
)
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
author
Mark Brown
<broonie@kernel.org>
Thu, 5 Feb 2015 20:18:39 +0000
(20:18 +0000)
committer
Mark Brown
<broonie@kernel.org>
Thu, 5 Feb 2015 20:18:39 +0000
(20:18 +0000)
Conflicts:
sound/soc/intel/sst/sst_acpi.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff