diff options
author | 2012-07-30 10:01:45 -0700 | |
---|---|---|
committer | 2012-07-30 10:01:45 -0700 | |
commit | f1115bb686207a32c655602b870b9e2b6b2d32c0 (patch) | |
tree | 0288abf290f053c921c560173066ac243687ccd9 /tools/perf/scripts/python/net_dropmonitor.py | |
parent | Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging (diff) | |
parent | Merge branch 'next' into for-linus (diff) | |
download | linux-dev-f1115bb686207a32c655602b870b9e2b6b2d32c0.tar.xz linux-dev-f1115bb686207a32c655602b870b9e2b6b2d32c0.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"A new driver for FT5x06 based EDT displays and a couple of other
driver changes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics - handle out of bounds values from the hardware
Input: wacom - add support to Cintiq 22HD
Input: add driver for FT5x06 based EDT displays
Diffstat (limited to 'tools/perf/scripts/python/net_dropmonitor.py')
0 files changed, 0 insertions, 0 deletions