aboutsummaryrefslogtreecommitdiff
path: root/drivers/input/joystick/xpad.c
diff options
context:
space:
mode:
authorGravatar Dmitry Torokhov <dmitry.torokhov@gmail.com> 2018-04-23 16:07:15 -0700
committerGravatar Dmitry Torokhov <dmitry.torokhov@gmail.com> 2018-04-23 16:07:15 -0700
commit57eb13a9e8f5d45a95d64da2174528666240031d (patch)
tree71aa69d108c3050a132c1181cb9b4a9eb69ac04e /drivers/input/joystick/xpad.c
parentInput: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad (diff)
parentInput: atmel_mxt_ts - remove platform data support (diff)
downloadlinux-57eb13a9e8f5d45a95d64da2174528666240031d.tar.gz
linux-57eb13a9e8f5d45a95d64da2174528666240031d.tar.bz2
linux-57eb13a9e8f5d45a95d64da2174528666240031d.zip
Merge branch 'ib-chrome-platform-input-atmel-mx-ts-platform-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform into next
Sync up with chrome-platform to bring in changes to Atmel touch controller.
Diffstat (limited to 'drivers/input/joystick/xpad.c')
0 files changed, 0 insertions, 0 deletions