Merge branch 'fix/hda' into topic/hda

Browse source

Conflicts:
	sound/pci/hda/alc268_quirks.c

...

This commit is contained in:

Takashi Iwai 2011-08-16 14:25:22 +02:00

parent 082632e235 c503ad466d

commit 497979262f

1 changed files with 12 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

24

sound/pci/hda/alc268_quirks.c

View file