Merge branch 'hwmod_data_cleanup_3.4' of git://git.pwsan.com/linux-2.6
authorTony Lindgren <tony@atomide.com>
Fri, 9 Mar 2012 01:28:28 +0000 (17:28 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 9 Mar 2012 01:28:28 +0000 (17:28 -0800)
Conflicts:
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c


Trivial merge