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