Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Wed, 7 Dec 2011 16:33:09 +0000 (17:33 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 7 Dec 2011 16:33:09 +0000 (17:33 +0100)
Conflicts:
sound/pci/hda/patch_realtek.c


Trivial merge