summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2014-06-04 13:09:43 +0200
committerJiri Kosina <jkosina@suse.cz>2014-06-04 13:09:43 +0200
commitbeea3f4a29e76561a3aa02cf5314c91a06150f60 (patch)
tree26951e8d2a72e90d95b3da218ef666496a580ecb
parentMerge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus (diff)
parentHID: i2c-hid: hid report descriptor retrieval changes (diff)
parentHID: rmi: do not handle touchscreens through hid-rmi (diff)
parentHID: hid-sony - allow 3rd party INTEC controller to turn off all leds (diff)
parentHID: thingm: thingm_fwinfo[] doesn't need to be global (diff)
downloadlinux-beea3f4a29e76561a3aa02cf5314c91a06150f60.tar.xz
linux-beea3f4a29e76561a3aa02cf5314c91a06150f60.zip
Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and 'for-3.16/thingm' into for-linus