Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 May 2009 02:38:25 +0000 (19:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 May 2009 02:38:25 +0000 (19:38 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM: Do not hold dpm_list_mtx while disabling/enabling nonboot CPUs


Trivial merge