Merge branch 'next-i2c-omap' into next-i2c