git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
[sfrench/cifs-2.6.git]
/
arch
/
i386
/
kernel
/
cpu
/
proc.c
diff --git
a/arch/i386/kernel/cpu/proc.c
b/arch/i386/kernel/cpu/proc.c
index 47e3ebbfb28df3755ab08e7c129363561192c88b..89d91e6cc97213849d87db7f537e0798a4fb968e 100644
(file)
--- a/
arch/i386/kernel/cpu/proc.c
+++ b/
arch/i386/kernel/cpu/proc.c
@@
-72,8
+72,7
@@
static int show_cpuinfo(struct seq_file *m, void *v)
"stc",
"100mhzsteps",
"hwpstate",
- NULL,
- NULL, /* constant_tsc - moved to flags */
+ "", /* constant_tsc - moved to flags */
/* nothing */
};
struct cpuinfo_x86 *c = v;