From: Rafael J. Wysocki Date: Wed, 23 Nov 2011 20:17:07 +0000 (+0100) Subject: Merge branch 'pm-sleep' into linux-next X-Git-Tag: next-20111124~24^2~6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2b3fbdd1d38fe7939012ab5ce5420a8732981275;p=karo-tx-linux.git Merge branch 'pm-sleep' into linux-next * pm-sleep: PM / Hibernate: Refactor and simplify hibernation_snapshot() code PM / Sleep: Simplify device_suspend_noirq() PM / Sleep: Remove unnecessary label and jumps to it form PM core code PM / Memory-hotplug: Avoid task freezing failures PM: Fix indentation and remove extraneous whitespaces in kernel/power/main.c --- 2b3fbdd1d38fe7939012ab5ce5420a8732981275