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 11:56:25 +01:00

parent 82894b6f6f f73d35853e

commit 0e19e7d2bf

2 changed files with 55 additions and 27 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

sound/pci/hda/hda_codec.c

View file

92

sound/pci/hda/patch_sigmatel.c

View file