Merge branch 'omap-for-v3.9/pm-wfi-take2' into omap-for-v3.9/tmp-merge
authorTony Lindgren <tony@atomide.com>
Mon, 11 Feb 2013 17:24:14 +0000 (09:24 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 11 Feb 2013 17:24:14 +0000 (09:24 -0800)

Trivial merge