Merge branch 'omap4-i2c-init' into omap-for-linus