diff --git a/[refs] b/[refs]
index 3585f161c410..eda641911b65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3ba4d34d031985366f7ea06395fa9772ff77ce6
+refs/heads/master: 0e12e1536c1b8aaef9baeed09a8f81da393fcba6
diff --git a/trunk/drivers/media/video/em28xx/em28xx-vbi.c b/trunk/drivers/media/video/em28xx/em28xx-vbi.c
index 070d8e57877e..94943e5a1529 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-vbi.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-vbi.c
@@ -140,10 +140,3 @@ struct videobuf_queue_ops em28xx_vbi_qops = {
 	.buf_queue    = vbi_queue,
 	.buf_release  = vbi_release,
 };
-
-/* ------------------------------------------------------------------ */
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */