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-12 10:02:04 +01:00

parent f43aa025b7 d7a8943635

commit 90d0be2fc3

2 changed files with 65 additions and 24 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/pci/hda/patch_analog.c

View file

87

sound/pci/hda/patch_sigmatel.c

View file