Merge branch 'for-2638/i2c/omap' into for-linus/i2c-2638