projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ada509e
e905a83
)
Merge branch 'fix/hda' into topic/via-cleanup
author
Takashi Iwai
<tiwai@suse.de>
Tue, 21 Jun 2011 05:34:00 +0000
(07:34 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Tue, 21 Jun 2011 05:34:45 +0000
(07:34 +0200)
Conflicts:
sound/pci/hda/patch_via.c
1
2
sound/pci/hda/patch_realtek.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
sound/pci/hda/patch_realtek.c
Simple merge