summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-multitouch.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-02-21 10:45:01 +0100
committerJiri Kosina <jkosina@suse.cz>2013-02-21 10:45:01 +0100
commit73759518d6d6b56e398791b7522328baf4181a82 (patch)
treea91375dfdb9f3aff472ceef897f5c076d40763a5 /drivers/hid/hid-multitouch.c
parentMerge branches 'for-3.8/upstream-fixes', 'for-3.9/hid-sensor', 'for-3.9/hidra... (diff)
parentHID: Correct Logitech order in hid-ids.h (diff)
parentHID: multitouch: do not use pointers towards hid-core (diff)
parentHID: ntrig: use input_configured() callback to set the name (diff)
parentHID: add ThingM blink(1) USB RGB LED support (diff)
downloadlinux-73759518d6d6b56e398791b7522328baf4181a82.tar.xz
linux-73759518d6d6b56e398791b7522328baf4181a82.zip
Merge branches 'for-3.9/logitech', 'for-3.9/multitouch', 'for-3.9/ntrig', 'for-3.9/thingm' and 'for-3.9/upstream' into for-linus