Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 22 Aug 2017 13:44:45 +0000 (15:44 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 22 Aug 2017 13:44:45 +0000 (15:44 +0200)
commit241bc82e62b28fdb7223b85180fd814f4963c971
treef0d1a3889fd027e017faa37fc34bffe2fa038c41
parent3a93d082bacf887b47737c4b75c083dea7570832
parent88c54cdf61f508ebcf8da2d819f5dfc03e954d1d
Merge branch 'for-linus' into for-next

Conflicts:
sound/core/control.c
sound/core/control.c
sound/firewire/motu/motu.c
sound/usb/mixer.c
sound/usb/quirks.c