Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Wed, 23 Nov 2011 16:08:42 +0000 (17:08 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 23 Nov 2011 16:08:42 +0000 (17:08 +0100)
commitb37c0096b448d099d304bb47c4eada9117dba4cf
treec38f4c41874967a8f187e4c972b6365fb7a9f7cf
parent8b940fc457fbf883053caf397586a61bd3cae23e
parent61071594f64ed12328046f94716d1d744bddc0a1
Merge branch 'fix/hda' into topic/hda

Conflicts:
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_realtek.c