From 913050632e40bcea4878dd20d758af7ea05bd2a1 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Sat, 8 Dec 2007 02:06:57 +0100
Subject: [PATCH] --- yaml --- r: 82380 b: refs/heads/master c:
 9575809c6fc15e7b6bb1932b6104c80a6d4ffdc9 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/power/disk.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0be361dffd0e..ca89ec402420 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9628c0ee6a6d9ef06a77ea25932c00817f9e88a0
+refs/heads/master: 9575809c6fc15e7b6bb1932b6104c80a6d4ffdc9
diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c
index 2a4bada184ed..3e24a200f1d4 100644
--- a/trunk/kernel/power/disk.c
+++ b/trunk/kernel/power/disk.c
@@ -568,8 +568,8 @@ static int software_resume(void)
 
 	if (noresume) {
 		/**
-		 * FIXME: If noresume is specified, we need to find the partition
-		 * and reset it back to normal swap space.
+		 * FIXME: If noresume is specified, we need to find the
+		 * partition and reset it back to normal swap space.
 		 */
 		mutex_unlock(&pm_mutex);
 		return 0;