Merge branch 'fix/hda' into topic/hda

Browse source

Conflicts:
	sound/pci/hda/patch_realtek.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>

...

This commit is contained in:

Takashi Iwai 2009-07-09 18:48:38 +02:00

parent b1e4422f96 005b10769c

commit 305355aad8

4 changed files with 88 additions and 59 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

11

sound/pci/hda/hda_beep.c

View file

34

sound/pci/hda/hda_intel.c

View file

13

sound/pci/hda/patch_realtek.c

View file

87

sound/pci/hda/patch_via.c

View file