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