Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 17 Oct 2017 08:50:59 +0000 (10:50 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 17 Oct 2017 08:52:06 +0000 (10:52 +0200)
commit0011a33f097dd97d09a1ebd32c5d8df0be7ac04a
tree706b30408893852c5d2f8ef3317ab17d407dcdea
parent49815404bd3870232de8800430a83d7d498ae1e2
parent99fee508245825765ff60155fed43f970ff83a8f
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>
sound/core/seq/seq_clientmgr.c
sound/usb/caiaq/device.c
sound/usb/line6/driver.c
sound/usb/line6/podhd.c