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-21 08:27:04 +01:00

parent 1725b82a6e 3a7abfd2ba

commit 75a287d9a3

2 changed files with 23 additions and 4 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

Documentation/sound/alsa/ALSA-Configuration.txt

View file

26

sound/pci/hda/patch_sigmatel.c

View file