Merge branches 'for-4.2/upstream-fixes-devm-fixed' and 'for-4.3/upstream' into for...
authorJiri Kosina <jkosina@suse.cz>
Tue, 1 Sep 2015 13:23:13 +0000 (15:23 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 1 Sep 2015 13:23:13 +0000 (15:23 +0200)
commit3e097d1271ecdff2f251a54ddfc5eaa1f9821e96
treed84a437e8ed4c3e71521c739952ba96fd02b3781
parent0be017120b80f0fe3da9a8239f989a27e54828f2
parentc9b57724b38d4c1555ee49418be3d76801e3327c
Merge branches 'for-4.2/upstream-fixes-devm-fixed' and 'for-4.3/upstream' into for-linus
drivers/hid/hid-input.c
drivers/hid/usbhid/hid-quirks.c
drivers/hid/wacom_sys.c