Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Tue, 16 Aug 2011 12:25:22 +0000 (14:25 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 16 Aug 2011 12:25:22 +0000 (14:25 +0200)
Conflicts:
sound/pci/hda/alc268_quirks.c


Trivial merge