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 20:54:30 +0000 (13:54 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 4 Oct 2011 20:54:30 +0000 (13:54 -0700)

Trivial merge