Merge branch 'hwmod' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Tue, 6 Mar 2012 22:32:56 +0000 (14:32 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Mar 2012 22:32:56 +0000 (14:32 -0800)
Conflicts:
arch/arm/plat-omap/omap_device.c


Trivial merge