From: Rafael J. Wysocki Date: Thu, 1 Dec 2011 20:50:37 +0000 (+0100) Subject: Merge branch 'pm-misc' into linux-next X-Git-Tag: next-20111202~25^2~10 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b0d64eceaac061325d5b8ef1cde199d9988f598d;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() --- b0d64eceaac061325d5b8ef1cde199d9988f598d