Merge branch 'for_3.6/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Sat, 11 Aug 2012 06:21:57 +0000 (23:21 -0700)
committerTony Lindgren <tony@atomide.com>
Sat, 11 Aug 2012 06:21:57 +0000 (23:21 -0700)

Trivial merge