Merge branch 'for-linus' into for-next

Back-merge for applying the timer API conversion patch for line6
driver that conflicts with the recent fix in upstream.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2017-10-17 10:50:59 +02:00
commit 0011a33f09
7 changed files with 40 additions and 14 deletions