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