]> Pileus Git - ~andy/linux/commit
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)
commit3e68001bb172304615b758d671d8a890fff912d9
tree02d50dfaf6de6f8edb016a8d922b40762634cc05
parent4962516b2309d76964f9df0d33e74f43b624a42d
parentd7268a31c8aabc5a29ccc7f76de84383e5f38737
Merge branch 'pm-misc' into pm-for-linus

* pm-misc:
  CPU: Add right qualifiers for alloc_frozen_cpus() and cpu_hotplug_pm_sync_init()
  PM / Usermodehelper: Cleanup remnants of usermodehelper_pm_callback()