Merge branch 'fix/hda' into topic/via-cleanup

Browse source

Conflicts:
	sound/pci/hda/patch_via.c

...

This commit is contained in:

Takashi Iwai 2011-06-21 07:34:00 +02:00

parent ada509ec00 e905a83acd

commit 216c7a0f22

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

1

sound/firewire/isight.c

View file

2

sound/pci/hda/hda_beep.h

View file

2

sound/pci/hda/patch_realtek.c

View file

2

sound/pci/lola/lola.c

View file

1

sound/usb/6fire/firmware.c

View file

4

sound/usb/6fire/pcm.c

View file