summaryrefslogtreecommitdiffstats
path: root/include/linux/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-05-14 16:49:19 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-05-14 16:49:19 -0700
commit879f99ef2c4c05d9a7f0a67a05f1415663119825 (patch)
tree0399664761f675eef741f8b08b92635069586151 /include/linux/input
parent70a26071f8552a0f193cf442f424decfe0f2e569 (diff)
parentd6d211db37e75de2ddc3a4f979038c40df7cc79c (diff)
downloadcachepc-linux-879f99ef2c4c05d9a7f0a67a05f1415663119825.tar.gz
cachepc-linux-879f99ef2c4c05d9a7f0a67a05f1415663119825.zip
Merge tag 'v3.15-rc5' into next
Merge with Linux 3.15-rc5 to sync up Wacom and other changes.
Diffstat (limited to 'include/linux/input')
0 files changed, 0 insertions, 0 deletions