Merge branch 'linus' into xen-64bit

1 files changed, 2 insertions, 1 deletions

diff --git a/init/do_mounts.c b/init/do_mounts.c
index 660c1e50c91b..a1de1bf3d6b9 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -372,7 +372,8 @@ void __init prepare_namespace(void)
 
         if (saved_root_name[0]) {
                 root_device_name = saved_root_name;
-                if (!strncmp(root_device_name, "mtd", 3)) {
+                if (!strncmp(root_device_name, "mtd", 3) ||
+                    !strncmp(root_device_name, "ubi", 3)) {
                         mount_block_root(root_device_name, root_mountflags);
                         goto out;
                 }