Merge branch 'for_3.6/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Thu, 28 Jun 2012 07:08:58 +0000 (00:08 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 28 Jun 2012 07:08:58 +0000 (00:08 -0700)

Trivial merge