diff --git a/[refs] b/[refs]
index 61123d0cf10a..7213f777c5aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee20a0dd5400e771ff93eb7f2bcc731eab1f377e
+refs/heads/master: f6d107fb10def502522b10bfb7af9533afbb8274
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
index 06968cd79200..87a6428cb5b6 100644
--- a/trunk/kernel/futex.c
+++ b/trunk/kernel/futex.c
@@ -2158,7 +2158,7 @@ static struct file_system_type futex_fs_type = {
 	.kill_sb	= kill_anon_super,
 };
 
-static int __init init(void)
+static int __init futex_init(void)
 {
 	u32 curval;
 	int i;
@@ -2194,4 +2194,4 @@ static int __init init(void)
 
 	return 0;
 }
-__initcall(init);
+__initcall(futex_init);