From: Linus Torvalds Date: Sat, 31 Oct 2015 01:49:44 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input X-Git-Tag: v5.15~14870 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38dab9ac1c017e96dc98e978111e365134d41d13;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input Pull input layer fixes from Dmitry Torokhov: - a change to the ALPS driver where we had limit the quirk for trackstick handling from being active on all Dells to just a few models - a fix for a build dependency issue in the sur40 driver - a small clock handling fixup in the LPC32xx touchscreen driver * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: alps - only the Dell Latitude D420/430/620/630 have separate stick button bits Input: sur40 - add dependency on VIDEO_V4L2 Input: lpc32xx_ts - fix warnings caused by enabling unprepared clock --- 38dab9ac1c017e96dc98e978111e365134d41d13