Merge branch 'omap4-i2c-init' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Thu, 20 May 2010 18:37:23 +0000 (11:37 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 20 May 2010 18:37:23 +0000 (11:37 -0700)
commitf6304f5804f228b6c2fea9e3dfac25c5b2db9b38
tree362b9b6a3bd32b868e5917a32d448ac75c5854df
parent4fa73a1bf89ebea4eba8a9982b5f64d266d8b5e9
parent6daa642d9b8ec762b3c5641cd5e5fa855a5405bf
Merge branch 'omap4-i2c-init' into omap-for-linus
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/omap_hwmod.c