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)
commit497979262f9e812be1d64e597ec1bbbf92c8eba3
tree19f8279b10b577e78d4614bdd5d6338b4a778d34
parent082632e235ecc4cf189366967037ed832a8ee523
parentc503ad466da44ca23c658986629bf7a2e2eabbb7
Merge branch 'fix/hda' into topic/hda

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