diff --git a/[refs] b/[refs] index e4257151cd44..ee2ac893591e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28afe961a18f77b2249062499bdbf70fd2ec6bba +refs/heads/master: 1986b0cb1671ea39178b4e2b00461109728fc935 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index 868e121c8e38..fc20e09a6cb1 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -1203,9 +1203,6 @@ static void *s_next(struct seq_file *m, void *v, loff_t *pos) iter->pos = *pos; - if (last_ent && !ent) - seq_puts(m, "\n\nvim:ft=help\n"); - return ent; }