Merge branch 'for-3.15/i2c-hid' into for-linus