summaryrefslogtreecommitdiffstats
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2016-12-29 10:08:49 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-12-29 10:08:49 -0800
commit72f0991354b24b9860ddc57b12d5c39bd8e3c962 (patch)
treef91da47db566f66aa57dbcf4adee5d6b213c2e2a /drivers/input/misc
parentb6fc513da50c5dbc457a8ad6b58b046a6a68fd9d (diff)
parentd7ddad0acc4add42567f7879b116a0b9eea31860 (diff)
downloadtalos-op-linux-72f0991354b24b9860ddc57b12d5c39bd8e3c962.tar.gz
talos-op-linux-72f0991354b24b9860ddc57b12d5c39bd8e3c962.zip
Merge branch 'synaptics-rmi4' into for-linus
This brings in fix for F03 build error when serio is module.
Diffstat (limited to 'drivers/input/misc')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud