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>

diff --cc sound/core/seq/seq_clientmgr.c
Simple merge

diff --cc sound/usb/caiaq/device.c
Simple merge

diff --cc sound/usb/line6/driver.c
Simple merge

diff --cc sound/usb/line6/podhd.c
Simple merge