From: Rafael J. Wysocki Date: Fri, 9 Dec 2011 22:38:27 +0000 (+0100) Subject: Merge branch 'pm-misc' into linux-next X-Git-Tag: next-20111212~29^2~4 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fc130fb1e8763b6960338d3c0c739c41fe5129c0;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() --- fc130fb1e8763b6960338d3c0c739c41fe5129c0