git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
83b0c6b
c817eeb
)
Merge branch 'fix/hda' into topic/hda
author
Takashi Iwai
<tiwai@suse.de>
Thu, 19 Apr 2012 15:17:59 +0000
(17:17 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Thu, 19 Apr 2012 15:20:13 +0000
(17:20 +0200)
Conflicts:
sound/pci/hda/patch_conexant.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff