projects / profile / common / kernel-common.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1e4422 005b107)
Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Thu, 9 Jul 2009 16:48:38 +0000 (18:48 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 9 Jul 2009 16:48:38 +0000 (18:48 +0200)
Conflicts:
sound/pci/hda/patch_realtek.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
1  2 
sound/pci/hda/hda_beep.c patch | diff1 | diff2 | blob | history
sound/pci/hda/hda_intel.c patch | diff1 | diff2 | blob | history
sound/pci/hda/patch_realtek.c patch | diff1 | diff2 | blob | history

diff --cc sound/pci/hda/hda_beep.c
Simple merge
diff --cc sound/pci/hda/hda_intel.c
Simple merge
diff --cc sound/pci/hda/patch_realtek.c
Simple merge
Domain: SCM / Uncategorized;