summaryrefslogtreecommitdiff
path: root/arch/mips/loongson64/loongson-3/numa.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-08-17 11:41:59 +0300
committerIngo Molnar <mingo@kernel.org>2015-08-17 11:41:59 +0300
commit5461bd81bf7f86503f393b0b1d57e69b1f1bd44e (patch)
tree25ec4a2f43019c4d7cc76eb6a967ec450add9401 /arch/mips/loongson64/loongson-3/numa.c
parent949163015ce6fdb76a5e846a3582d3c40c23c001 (diff)
parent2c6625cd545bdd66acff14f3394865d43920a5c7 (diff)
downloadlinux-5461bd81bf7f86503f393b0b1d57e69b1f1bd44e.tar.xz
Merge tag 'v4.2-rc7' into x86/boot, to refresh the branch before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/loongson64/loongson-3/numa.c')
-rw-r--r--arch/mips/loongson64/loongson-3/numa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/loongson64/loongson-3/numa.c b/arch/mips/loongson64/loongson-3/numa.c
index 12d14ed48778..6f9e010cec4d 100644
--- a/arch/mips/loongson64/loongson-3/numa.c
+++ b/arch/mips/loongson64/loongson-3/numa.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2010 Loongson Inc. & Lemote Inc. &
- * Insititute of Computing Technology
+ * Institute of Computing Technology
* Author: Xiang Gao, gaoxiang@ict.ac.cn
* Huacai Chen, chenhc@lemote.com
* Xiaofu Meng, Shuangshuang Zhang