Merge branches 'for-4.8/alps', 'for-4.8/apple', 'for-4.8/i2c-hid', 'for-4.8/uhid...
authorJiri Kosina <jkosina@suse.cz>
Thu, 28 Jul 2016 08:48:15 +0000 (10:48 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 28 Jul 2016 08:48:15 +0000 (10:48 +0200)
commite82a82c19f4272ea5437cc76e5711b98e2ee6223
tree056b36e32324238a895c02bb5a6c13c89cb20f10
parent819d64e51d6260f8f7ef352cf42fc1ea67a0f7db
parentb5d9427549be859dd42c5a6c635bc09d1d07b00b
parentd9f448e3d71f3a703977196fa73be533b4b85adc
parent67f8ecc550b5bda03335f845dc869b8501d25fd0
parentddfe8483e9a938ed82b411e1f47c3249f0567658
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
drivers/hid/hid-core.c
drivers/hid/hid-ids.h