summaryrefslogtreecommitdiffstats
path: root/drivers/input/misc/kxtj9.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2013-09-18 07:58:33 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-09-18 07:58:33 -0700
commit4ba25a496f62129a2ad8c2436ab2b402752dc66c (patch)
tree8abf41a79f293832a430a9609530c24cd365466c /drivers/input/misc/kxtj9.c
parent390de835b61228abf6646f2b14530edca8d7512f (diff)
parent6e4664525b1db28f8c4e1130957f70a94c19213e (diff)
downloadtalos-obmc-linux-4ba25a496f62129a2ad8c2436ab2b402752dc66c.tar.gz
talos-obmc-linux-4ba25a496f62129a2ad8c2436ab2b402752dc66c.zip
Merge tag 'v3.11' into next
Merge with mainline to bring in sync changes to cyttsp4 driver.
Diffstat (limited to 'drivers/input/misc/kxtj9.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud