Merge tag 'v4.17-rc6' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 24 May 2018 16:30:15 +0000 (09:30 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 24 May 2018 16:30:15 +0000 (09:30 -0700)
commit754451342fc5954061ede74b0a8485ec4a4c6eaa
tree82daccba5779de492631c42e47a614bd9d4cddd2
parentbf232e460a3530adf17da7d7f1332347b73a3d08
parent771c577c23bac90597c685971d7297ea00f99d11
Merge tag 'v4.17-rc6' into next

Sync up with mainline to bring in Atmel controller changes for Caroline.
MAINTAINERS
drivers/input/joystick/xpad.c
drivers/input/mouse/alps.c
drivers/input/touchscreen/Kconfig