Merge branch 'for_3.6/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Wed, 27 Jun 2012 12:08:14 +0000 (05:08 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 27 Jun 2012 12:08:14 +0000 (05:08 -0700)

Trivial merge