diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:56:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:56:35 +0200 |
| commit | f7b6a8b30cedaa64ba18d80f1fb3404274281639 (patch) | |
| tree | 13937ba94eed328bb19b1ccf343cca35446b878b /arch/mips/kernel/time.c | |
| parent | b33fb3cf6f5e039dea4a85a708a2c86f8a323575 (diff) | |
| parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
Merge tag 'v5.2-rc3' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/kernel/time.c')
| -rw-r--r-- | arch/mips/kernel/time.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index bfe02ded25d1f..37e9413a393d3 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -1,14 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2001 MontaVista Software Inc. * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net * Copyright (c) 2003, 2004 Maciej W. Rozycki * * Common time service routines for MIPS machines. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. */ #include <linux/bug.h> #include <linux/clockchips.h> |