summaryrefslogtreecommitdiff
path: root/drivers/hid/hid-sony.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2014-04-01 19:06:50 +0200
committerJiri Kosina <jkosina@suse.cz>2014-04-01 19:06:50 +0200
commitfa1054a29b21e4c932b5c93def600149451cec32 (patch)
tree88ada194d3004c02dcef9fef15c6609275284368 /drivers/hid/hid-sony.c
parent6cf8c85f8bc320ca0273c5261cc13ee1491d7b92 (diff)
parent9abebedb123a577ecc5b69b2a2515499e430be24 (diff)
parentb95dd3ca034a044471242fcbc8b8256f272b5062 (diff)
parent4522643aa9630be17238edf1b4c0b690c5dd7f5d (diff)
Merge branches 'for-3.15/multitouch', 'for-3.15/sony' and 'for-3.15/uhid' into for-linus