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