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

diff --cc drivers/mtd/mtd_blkdevs.c
Simple merge

diff --cc fs/Kconfig
Simple merge

diff --cc fs/jffs2/background.c
index 8754b27,143c553..d568ae8
--- 1/fs/jffs2/background.c
--- 2/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"));