]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commit305355aad89f1b7eb27cb210fad2f9d3c67b2572
treeb7510300fae4fd06a29b2d773fb841e4ca3c8956
parentb1e4422f96a9b4830ffd8119b05211abb830ef4a
parent005b10769c05fb16db70f7689ffb5ba17e3fc324
Merge branch 'fix/hda' into topic/hda

Conflicts:
sound/pci/hda/patch_realtek.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_beep.c
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_realtek.c