From: Rafael J. Wysocki Date: Thu, 8 Dec 2011 22:24:52 +0000 (+0100) Subject: Merge branch 'pm-misc' into linux-next X-Git-Tag: next-20111209~30^2~9 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f047a40483222ee8c0fc738d08e9e4504d6c9a9b;p=karo-tx-linux.git Merge branch 'pm-misc' into linux-next * pm-misc: CPU: Add right qualifiers for alloc_frozen_cpus() and cpu_hotplug_pm_sync_init() PM / Usermodehelper: Cleanup remnants of usermodehelper_pm_callback() --- f047a40483222ee8c0fc738d08e9e4504d6c9a9b