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

This commit is contained in:
Ben Dooks 2011-01-12 22:24:36 +00:00
commit 7f42f9fef7