From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Fri, 19 Aug 2011 21:44:31 +0000 (+0200)
Subject: Merge branch 'pm-next' into linux-next
X-Git-Tag: next-20110822~18^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=59308d0538bd917c59f1b70225024fe98b480b32;p=karo-tx-linux.git

Merge branch 'pm-next' into linux-next

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

59308d0538bd917c59f1b70225024fe98b480b32