diff --git a/[refs] b/[refs]
index 76b9a5267fc4..8ad059ac270a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7a9f3aa1e1b6c7ade5208b30683bec3553c3079
+refs/heads/master: 2e43c953bfd31f0104f916b2f39e6d3d8b1a3099
diff --git a/trunk/drivers/media/video/tuner-types.c b/trunk/drivers/media/video/tuner-types.c
index 87f28b5a2cfa..9276ad33d03b 100644
--- a/trunk/drivers/media/video/tuner-types.c
+++ b/trunk/drivers/media/video/tuner-types.c
@@ -1488,11 +1488,3 @@ EXPORT_SYMBOL(tuner_count);
 MODULE_DESCRIPTION("Simple tuner device type database");
 MODULE_AUTHOR("Ralph Metzler, Gerd Knorr, Gunther Mayer");
 MODULE_LICENSE("GPL");
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-basic-offset: 8
- * End:
- */