From: David Woodhouse <dwmw2@infradead.org>
Date: Mon, 23 Jul 2007 09:20:10 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.24-rc1~1364^2~54
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=39fe5434cb9de5da40510028b17b96bc4eb312b3;p=~shefty%2Frdma-dev.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
---

39fe5434cb9de5da40510028b17b96bc4eb312b3
diff --cc fs/jffs2/background.c
index 8754b274211,143c5530caf..d568ae84674
--- a/fs/jffs2/background.c
+++ b/fs/jffs2/background.c
@@@ -81,9 -81,10 +81,10 @@@ static int jffs2_garbage_collect_thread
  
  	set_user_nice(current, 10);
  
+ 	set_freezable();
  	for (;;) {
  		allow_signal(SIGHUP);
 -
 +	again:
  		if (!jffs2_thread_should_wake(c)) {
  			set_current_state (TASK_INTERRUPTIBLE);
  			D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread sleeping...\n"));