From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Mon, 26 Sep 2011 18:40:48 +0000 (+0200)
Subject: Merge branch 'pm-assorted' into pm-test
X-Git-Tag: next-20110927~28^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7377fb86179b20d047614bd641273b4d7a38f4eb;p=karo-tx-linux.git

Merge branch 'pm-assorted' into pm-test

* pm-assorted:
  PM / Hibernate: Freeze kernel threads after preallocating memory
  PM: Update the policy on default wakeup settings
  PM / VT: Cleanup #if defined uglyness and fix compile error
  PM / Suspend: Off by one in pm_suspend()
  PM / Hibernate: Include storage keys in hibernation image on s390
  PM: Fix build issue in main.c for CONFIG_PM_SLEEP unset
  PM / Suspend: Add statistics debugfs file for suspend to RAM

Conflicts:
	kernel/power/Makefile
---

7377fb86179b20d047614bd641273b4d7a38f4eb
diff --cc kernel/power/Makefile
index ad6bdd8b401a,b87c77c10abd..07e0e28ffba7
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@@ -1,8 -1,8 +1,8 @@@
  
  ccflags-$(CONFIG_PM_DEBUG)	:= -DDEBUG
  
 -obj-$(CONFIG_PM)		+= main.o
 +obj-$(CONFIG_PM)		+= main.o qos.o
- obj-$(CONFIG_PM_SLEEP)		+= console.o
+ obj-$(CONFIG_VT_CONSOLE_SLEEP)	+= console.o
  obj-$(CONFIG_FREEZER)		+= process.o
  obj-$(CONFIG_SUSPEND)		+= suspend.o
  obj-$(CONFIG_PM_TEST_SUSPEND)	+= suspend_test.o