Merge branch 'for-31-rc5/i2c-fixes' of git://git.fluff.org/bjdooks/linux