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