diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-07-21 08:57:44 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-07-21 08:57:44 +0300 |
commit | f6a74a5e15df32f289837feeabf8c84829312b06 (patch) | |
tree | c8d16b12ef76c7a9e21693d1bad31f59f78436cd /arch/mips/loongson64/loongson-3/numa.c | |
parent | 60cd37eb100c4880b28078a47f3062fac7572095 (diff) | |
parent | 9d634c410b07be7bf637ea03362d3ff132088fe3 (diff) | |
download | linux-f6a74a5e15df32f289837feeabf8c84829312b06.tar.xz |
Merge branch 'linus' into perf/core, to refresh the branch
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.c | 2 |
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 |