diff --git a/[refs] b/[refs]
index e54c1833f643..597ff198d334 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ab8eb1cffcc5640ca5b07c2a0ddfaa8fbbcc754
+refs/heads/master: 215122e1110f97a3f478829049b9840cf8fdde57
diff --git a/trunk/fs/char_dev.c b/trunk/fs/char_dev.c
index a885f46ca001..e6194e2b9bb9 100644
--- a/trunk/fs/char_dev.c
+++ b/trunk/fs/char_dev.c
@@ -108,6 +108,13 @@ __register_chrdev_region(unsigned int major, unsigned int baseminor,
 	/* temporary */
 	if (major == 0) {
 		for (i = ARRAY_SIZE(chrdevs)-1; i > 0; i--) {
+			/*
+			 * Disallow the LANANA-assigned LOCAL/EXPERIMENTAL
+			 * majors
+			 */
+			if ((60 <= i && i <= 63) || (120 <= i && i <= 127) ||
+					(240 <= i && i <= 254))
+				continue;
 			if (chrdevs[i] == NULL)
 				break;
 		}