Merge branch 'for-linus/i2c-2635' of git://git.fluff.org/bjdooks/linux