Merge branch 'next-i2c' of git://git.fluff.org/bjdooks/linux