From: Rafael J. Wysocki Date: Wed, 23 Nov 2011 20:17:02 +0000 (+0100) Subject: Merge branch 'pm-misc' into linux-next X-Git-Tag: next-20111124~24^2~7 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3be981110ddc8282c86b7c54bbc6791187c33c85;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() --- 3be981110ddc8282c86b7c54bbc6791187c33c85