Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Sat, 9 Jul 2011 09:58:06 +0000 (11:58 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 9 Jul 2011 09:58:06 +0000 (11:58 +0200)
Conflicts:
sound/pci/hda/patch_realtek.c


Trivial merge