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)
commitb31b43e9fb49b71ae753bebc185fe55797ba20c6
tree702b451d43f50e348b4e5064ed11a24b48eceb0b
parentc82c8abdeef53eb0bb0504becb4e91bbccceaee8
parent38f1df27e3191d76e983cb9c6b4392582fd32fda
Merge branch 'fix/hda' into topic/hda

Conflicts:
sound/pci/hda/hda_intel.c
sound/pci/hda/hda_intel.c