Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Mon, 2 Mar 2009 07:04:10 +0000 (08:04 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 2 Mar 2009 07:04:10 +0000 (08:04 +0100)
Conflicts:
sound/pci/hda/hda_intel.c


Trivial merge