Merge branch 'for_3.2/omap_device-2' of git://github.com/khilman/linux-omap-pm into dt
authorTony Lindgren <tony@atomide.com>
Fri, 30 Sep 2011 19:48:01 +0000 (12:48 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 30 Sep 2011 19:48:01 +0000 (12:48 -0700)

Trivial merge