Merge branches 'for-3.8/upstream-fixes', 'for-3.9/hid-sensor',...

Merge branches 'for-3.8/upstream-fixes', 'for-3.9/hid-sensor', 'for-3.9/hidraw' and 'for-3.9/i2c-hid' into for-linus

Conflicts:
	drivers/hid/i2c-hid/i2c-hid.c