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-13 14:38:00 +01:00

parent c4da29ca08 6a12afb564

commit cd80bc6f48

3 changed files with 72 additions and 6 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

8

sound/pci/hda/hda_beep.c

View file

1

sound/pci/hda/hda_beep.h

View file

69

sound/pci/hda/patch_sigmatel.c

View file