Merge branch 'omap-for-v3.11/pm-serial' into omap-for-v3.11/tmp-merge
authorTony Lindgren <tony@atomide.com>
Tue, 18 Jun 2013 11:51:44 +0000 (04:51 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 18 Jun 2013 11:51:44 +0000 (04:51 -0700)

Trivial merge