diff options
author | Jiri Kosina <jkosina@suse.cz> | 2014-06-04 13:09:43 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2014-06-04 13:09:43 +0200 |
commit | beea3f4a29e76561a3aa02cf5314c91a06150f60 (patch) | |
tree | 26951e8d2a72e90d95b3da218ef666496a580ecb | |
parent | Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus (diff) | |
parent | HID: i2c-hid: hid report descriptor retrieval changes (diff) | |
parent | HID: rmi: do not handle touchscreens through hid-rmi (diff) | |
parent | HID: hid-sony - allow 3rd party INTEC controller to turn off all leds (diff) | |
parent | HID: thingm: thingm_fwinfo[] doesn't need to be global (diff) | |
download | linux-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