git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
db9c6f8
31ef225
)
Merge branch 'test/hda-jack' into topic/hda
author
Takashi Iwai
<tiwai@suse.de>
Tue, 20 Dec 2011 14:42:57 +0000
(15:42 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Tue, 20 Dec 2011 14:42:57 +0000
(15:42 +0100)
Conflicts:
sound/pci/hda/patch_hdmi.c
sound/pci/hda/patch_via.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff