From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Thu, 23 Aug 2012 00:48:30 +0000 (+0200)
Subject: Merge branch 'pm-sleep-next' into linux-next
X-Git-Tag: next-20120824~37^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4609919e8fa1dcd717f1d35f3ac06cac9539f942;p=karo-tx-linux.git

Merge branch 'pm-sleep-next' into linux-next

* pm-sleep-next:
  PM / Freezer: Fix small typo "regrigerator"
  PM / Sleep: Print name of wakeup source that aborts suspend
---

4609919e8fa1dcd717f1d35f3ac06cac9539f942