Merge branch 'fix/hda' into topic/hda

Browse source

Conflicts:
	sound/pci/hda/patch_realtek.c

...

This commit is contained in:

Takashi Iwai 2011-08-23 15:02:36 +02:00

parent 188cd2b5c6 1f015f5fdc

commit 5fa9b15112

6 changed files with 56 additions and 31 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

2

sound/aoa/fabrics/layout.c

View file

31

sound/pci/hda/hda_eld.c

View file

8

sound/pci/hda/patch_cirrus.c

View file

13

sound/pci/hda/patch_conexant.c

View file

30

sound/pci/hda/patch_realtek.c

View file

3

sound/usb/mixer.c

View file