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