Merge branch 'i2c-fix' of git://aeryn.fluff.org.uk/bjdooks/linux