From: Rafael J. Wysocki Date: Sun, 25 Dec 2011 22:41:23 +0000 (+0100) Subject: Merge branch 'pm-misc' into pm-for-linus X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3e68001bb172304615b758d671d8a890fff912d9;p=linux.git 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() --- 3e68001bb172304615b758d671d8a890fff912d9