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-15 19:05:21 +01:00

parent 127e82e3bf c39555d6ed

commit e2da9ba570

1 changed files with 1 additions and 1 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_sigmatel.c

View file