Merge branch 'pm-misc' into pm-for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Sun, 25 Dec 2011 22:41:23 +0000 (23:41 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Sun, 25 Dec 2011 22:41:23 +0000 (23:41 +0100)
* pm-misc:
  CPU: Add right qualifiers for alloc_frozen_cpus() and cpu_hotplug_pm_sync_init()
  PM / Usermodehelper: Cleanup remnants of usermodehelper_pm_callback()


Trivial merge