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