Merge branch 'for_3.2/3_omap_devicetree' of git://gitorious.org/omap-pm/linux into dt
authorTony Lindgren <tony@atomide.com>
Tue, 4 Oct 2011 16:17:15 +0000 (09:17 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 4 Oct 2011 16:17:15 +0000 (09:17 -0700)
Conflicts:
arch/arm/mach-omap2/omap_l3_noc.c


Trivial merge