From: Takashi Iwai Date: Tue, 17 Oct 2017 08:50:59 +0000 (+0200) Subject: Merge branch 'for-linus' into for-next X-Git-Tag: v4.15-rc1~18^2~16^2~18 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0011a33f097dd97d09a1ebd32c5d8df0be7ac04a;p=linux-block.git 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 --- 0011a33f097dd97d09a1ebd32c5d8df0be7ac04a