Merge branch 'fix/hda' into topic/hda

Browse source

Conflicts:
	sound/pci/hda/patch_realtek.c

...

This commit is contained in:

Takashi Iwai 2009-02-27 17:47:31 +01:00

parent bedfcebb4f bb543c9694

commit f897497673

2 changed files with 2 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

1

sound/pci/hda/patch_realtek.c

View file

2

sound/pci/hda/patch_sigmatel.c

View file