]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite84265aab682fc7bbf83d5e95d65de8c98005ec4
tree706b30408893852c5d2f8ef3317ab17d407dcdea
parentc3cddc8bfd7ac8958e4482bad67584d303a9dbc8
parentf133cd8178bb04a52a15f08c9df8df95d7f401b5
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