Merge branch 'topic/fix/hda' into topic/hda

Browse source

Conflicts:
	sound/pci/hda/patch_sigmatel.c

...

This commit is contained in:

Takashi Iwai 2008-11-25 15:20:57 +01:00

parent ee09543c86 661cd8fb52

commit eefe93b995

2 changed files with 29 additions and 22 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

4

Documentation/sound/alsa/ALSA-Configuration.txt

View file

47

sound/pci/hda/patch_sigmatel.c

View file