git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9e8af74
535115b
)
Merge branch 'for-linus' into for-next
author
Takashi Iwai
<tiwai@suse.de>
Fri, 12 Jun 2015 06:10:20 +0000
(08:10 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Fri, 12 Jun 2015 06:10:20 +0000
(08:10 +0200)
Yet another non-trivial conflicts resolution for the recent HD-audio fix.
Conflicts:
sound/pci/hda/hda_intel.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff