Merge branch 'for-linus' into for-next

Conflicts:
	sound/core/control.c
This commit is contained in:
Takashi Iwai 2017-08-22 15:44:45 +02:00
commit 241bc82e62
13 changed files with 55 additions and 26 deletions