]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite8b2db8b1c44a7372340b8867de056462596c26e
tree82daccba5779de492631c42e47a614bd9d4cddd2
parent994097402440c4a86b6e2237133447fc04265496
parent79a4347c21dc3c02727157c3d73c83bff31de497
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