Merge branch 'for-linus' into for-next

Browse source

Conflicts:
	sound/pci/hda/patch_realtek.c

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

...

This commit is contained in:

Takashi Iwai 2015-06-15 13:15:48 +02:00

parent 70a3887a8d 8b99aba70c

commit 88f1236bfa

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

17

sound/pci/hda/patch_realtek.c

View file

25

sound/pci/hda/patch_sigmatel.c

View file