Merge branch 'for_3.5/fixes/pm-3' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Fri, 6 Jul 2012 08:58:23 +0000 (01:58 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 6 Jul 2012 08:58:23 +0000 (01:58 -0700)

Trivial merge