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)
Conflicts:
sound/pci/hda/patch_realtek.c


Trivial merge