Merge branch 'for_3.2/omap_device' of git://gitorious.org/khilman/linux-omap-pm into...
authorTony Lindgren <tony@atomide.com>
Thu, 22 Sep 2011 23:38:39 +0000 (16:38 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 22 Sep 2011 23:38:39 +0000 (16:38 -0700)

Trivial merge