Merge branch 'omap-for-v3.11/pm' into omap-for-v3.11/tmp-merge
authorTony Lindgren <tony@atomide.com>
Wed, 12 Jun 2013 17:17:01 +0000 (10:17 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 12 Jun 2013 17:17:01 +0000 (10:17 -0700)

Trivial merge