Merge branch 'for-linus' into for-next

Browse source

Resolved the conflicts with the latest HDA HDMI fixes.

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

...

This commit is contained in:

Takashi Iwai 2016-03-04 08:41:41 +01:00

parent 03367bf7fd 790b415c98

commit 6defb60ae4

8 changed files with 28 additions and 32 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/core/seq/oss/seq_oss.c

View file

1

sound/core/seq/oss/seq_oss_device.h

View file

16

sound/core/seq/oss/seq_oss_init.c

View file

19

sound/pci/hda/patch_hdmi.c

View file

1

sound/pci/hda/patch_realtek.c

View file

4

sound/pci/rme9652/hdsp.c

View file

16

sound/pci/rme9652/hdspm.c

View file

1

sound/usb/quirks.c

View file