diff --git a/[refs] b/[refs]
index 599da9983405..9747d7e4fd99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a52f362f864f56238c9036f5c56f763a80e2ddd5
+refs/heads/master: b4ac91a0eac36f347a509afda07e4305e931de61
diff --git a/trunk/arch/um/include/chan_user.h b/trunk/arch/um/include/chan_user.h
index ad671eb9edeb..38f16d812e7c 100644
--- a/trunk/arch/um/include/chan_user.h
+++ b/trunk/arch/um/include/chan_user.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)
  * Licensed under the GPL
  */
@@ -54,14 +54,3 @@ __uml_help(fn, prefix "[0-9]*=<channel description>\n" \
 );
 
 #endif
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */