summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2016-07-28 10:48:15 +0200
committerJiri Kosina <jkosina@suse.cz>2016-07-28 10:48:15 +0200
commite82a82c19f4272ea5437cc76e5711b98e2ee6223 (patch)
tree056b36e32324238a895c02bb5a6c13c89cb20f10 /drivers
parentHID: alps: a few cleanups (diff)
parentHID: add usb device id for Apple Magic Keyboard (diff)
parentHID: i2c-hid: set power sleep before shutdown (diff)
parentHID: uhid: fix timeout when probe races with IO (diff)
parentHID: thingm: simplify debug output code (diff)
downloadlinux-e82a82c19f4272ea5437cc76e5711b98e2ee6223.tar.xz
linux-e82a82c19f4272ea5437cc76e5711b98e2ee6223.zip
Merge branches 'for-4.8/alps', 'for-4.8/apple', 'for-4.8/i2c-hid', 'for-4.8/uhid-offload-hid-device-add' and 'for-4.8/upstream' into for-linus