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