Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	include/linux/nfs_fs.h

Fixed up conflict with kernel header updates.

2 files changed, 6 insertions, 4 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 3b36a1d536..df864a3582 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -182,7 +182,8 @@ config AUDITSYSCALL
         help
           Enable low-overhead system-call auditing infrastructure that
           can be used independently or with another kernel subsystem,
-          such as SELinux.
+          such as SELinux.  To use audit's filesystem watch feature, please
+          ensure that INOTIFY is configured.
 
 config IKCONFIG
         bool "Kernel .config support"
@@ -389,9 +390,6 @@ config SLOB
         default !SLAB
         bool
 
-config OBSOLETE_INTERMODULE
-        tristate
-
 menu "Loadable module support"
 
 config MODULES
diff --git a/init/do_mounts.c b/init/do_mounts.c
index f4b7b9d278..21b3b8f33a 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -409,6 +409,10 @@ void __init prepare_namespace(void)
 
         if (saved_root_name[0]) {
                 root_device_name = saved_root_name;
+                if (!strncmp(root_device_name, "mtd", 3)) {
+                        mount_block_root(root_device_name, root_mountflags);
+                        goto out;
+                }
                 ROOT_DEV = name_to_dev_t(root_device_name);
                 if (strncmp(root_device_name, "/dev/", 5) == 0)
                         root_device_name += 5;