From 6341b259d012694218e849ce56d269d80e5b3fc1 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Thu, 7 Mar 2013 01:08:55 -0800
Subject: [PATCH] --- yaml --- r: 361015 b: refs/heads/master c:
 9141770548d529b9d32d5b08d59b65ee65afe0d4 h: refs/heads/master i:   361013:
 b1d19de2f845400a6a6b36d016aece8c1c6e01c8   361011:
 266f19a453045e35d3455431acc8d4faebf03df3   361007:
 a7d01542c96d7a8ab420acf8b318d18ceeb6a833 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/devpts/inode.c | 1 -
 trunk/fs/ocfs2/super.c  | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 36548a2319b5..da7d80b7ca1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f78e0351394052e1a6293e175825eb5c7869507
+refs/heads/master: 9141770548d529b9d32d5b08d59b65ee65afe0d4
diff --git a/trunk/fs/devpts/inode.c b/trunk/fs/devpts/inode.c
index 79b662985efe..073d30b9d1ac 100644
--- a/trunk/fs/devpts/inode.c
+++ b/trunk/fs/devpts/inode.c
@@ -510,7 +510,6 @@ static struct file_system_type devpts_fs_type = {
 	.fs_flags	= FS_USERNS_MOUNT | FS_USERNS_DEV_MOUNT,
 #endif
 };
-MODULE_ALIAS_FS("devpts");
 
 /*
  * The normal naming convention is simply /dev/pts/<number>; this conforms
diff --git a/trunk/fs/ocfs2/super.c b/trunk/fs/ocfs2/super.c
index 9b6910dec4ba..01b85165552b 100644
--- a/trunk/fs/ocfs2/super.c
+++ b/trunk/fs/ocfs2/super.c
@@ -1266,6 +1266,7 @@ static struct file_system_type ocfs2_fs_type = {
 	.fs_flags       = FS_REQUIRES_DEV|FS_RENAME_DOES_D_MOVE,
 	.next           = NULL
 };
+MODULE_ALIAS_FS("ocfs2");
 
 static int ocfs2_check_set_options(struct super_block *sb,
 				   struct mount_options *options)