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