Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
David Woodhouse [Mon, 23 Jul 2007 09:20:10 +0000 (10:20 +0100)]
1  2 
drivers/mtd/mtd_blkdevs.c
fs/Kconfig
fs/jffs2/background.c

Simple merge
diff --cc fs/Kconfig
Simple merge
@@@ -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"));