Merge branch 'i2c/quirks' into i2c/for-4.1