diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:50:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:50:18 +0200 |
| commit | 26b73da3604cc1a6596406d136b14d1a01c3676f (patch) | |
| tree | c7839809e35fce4868910742157e8ef96782b378 /arch/mips/include/asm/time.h | |
| parent | 5ca584d935c32906d114924dc0e1dbfcbb13fdb2 (diff) | |
| parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
Merge tag 'v5.2-rc3' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/include/asm/time.h')
| -rw-r--r-- | arch/mips/include/asm/time.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h index b85ec64ee7e9..e855a3611d92 100644 --- a/arch/mips/include/asm/time.h +++ b/arch/mips/include/asm/time.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2001, 2002, MontaVista Software Inc. * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net @@ -5,11 +6,6 @@ * * include/asm-mips/time.h * header file for the new style time.c file and time services. - * - * 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. */ #ifndef _ASM_TIME_H #define _ASM_TIME_H |