]> 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)
commitc97a1327ff5ae81b047d8d3e907ba66c4e438a7f
tree82daccba5779de492631c42e47a614bd9d4cddd2
parentfab5aab98f9723faac535f852208244731fdd5dd
parentb833267e820b3fe13c292bb67f46adc7434ef1e4
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