From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Thu, 25 Aug 2011 13:39:07 +0000 (+0200)
Subject: Merge branch 'pm-assorted' into linux-next
X-Git-Tag: next-20110826~25^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6bbf38d603156d95d56160a42fe3fa4defea87a4;p=karo-tx-linux.git

Merge branch 'pm-assorted' into linux-next

* pm-assorted:
  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
---

6bbf38d603156d95d56160a42fe3fa4defea87a4