Merge branch 'omap4-i2c-init' into omap-for-linus
Tony Lindgren [Thu, 20 May 2010 18:37:23 +0000 (11:37 -0700)]
1  2 
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/omap_hwmod.c

Simple merge
Simple merge