Merge branch 'fix/hda' into topic/hda

Browse source

Conflicts:
	sound/pci/hda/patch_conexant.c

...

This commit is contained in:

Takashi Iwai 2012-04-07 12:26:55 +02:00

parent 18dcd3044e 250f32747e

commit 5ff5c3a4ab

5 changed files with 61 additions and 77 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

4

sound/pci/asihpi/hpi_internal.h

View file

10

sound/pci/asihpi/hpios.c

View file

3

sound/pci/hda/hda_codec.h

View file

13

sound/pci/hda/hda_proc.c

View file

108

sound/pci/hda/patch_conexant.c

View file