Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech...

Conflicts:
	drivers/hid/hid-logitech-hidpp.c

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/hid-logitech-hidpp.c
Simple merge

diff --cc drivers/hid/i2c-hid/i2c-hid.c
Simple merge

diff --cc drivers/hid/usbhid/hid-quirks.c
Simple merge