summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2015-11-06 23:45:15 +0300
committerJiri Kosina <jkosina@suse.cz>2015-11-06 23:45:15 +0300
commitd64e19db030dadb1c9d2747ace919fd952be359c (patch)
tree9747c095fff945b3a265cacdf2b11a0b91fc28de /drivers/hid
parentdf7079380554e6e8e13a0812c7e6c72f669aba5c (diff)
parent937804f3c706970f83ca5f58483e0ca14ef19d84 (diff)
parent18339f59c3a6698ee17d32970c9e1e450b16e7c3 (diff)
parentf3984edc171c9f1296502d6d5e41290785816736 (diff)
parent29fae1c85166ef525b8b6518e749295e0c9d1e20 (diff)
parentc6956eb70e2549a3c2fa6ee525e02776d293caf4 (diff)
parent6d4f5440a3a2bb2e9d0d582bbf98234e9e9bb095 (diff)
parent8d2f8479da3c319218f030dc47382e55b67c2007 (diff)
parent636a89d43e39edacc473c722879f10527acfc95c (diff)
parent86e88f0e7068e37d9774eb9d93515c44ffa74006 (diff)
downloadlinux-d64e19db030dadb1c9d2747ace919fd952be359c.tar.xz
Merge branches 'for-4.3/upstream-fixes', 'for-4.4/corsair', 'for-4.4/dragonrise', 'for-4.4/i2c-hid', 'for-4.4/logitech', 'for-4.4/microsoft', 'for-4.4/multitouch', 'for-4.4/roccat-sysfs-deprecation', 'for-4.4/upstream' and 'for-4.4/wacom' into for-linus