On 04/08/2014 11:59 AM, Markos Chandras wrote:
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 037a44d..e12843a 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -124,7 +124,6 @@ static int show_cpuinfo(struct seq_file *m, void *v)
seq_printf(m, "kscratch registers\t: %d\n",
hweight8(cpu_data[n].kscratch_mask));
seq_printf(m, "core\t\t\t: %d\n", cpu_data[n].core);
-
Hi Ralf,
This change was not intentional. It's due to a bad merge conflict
resolution. Could you please fix this before you merge this patch?
Thanks!
--
markos
