diff options
| author | Thomas Gleixner | 2019-07-03 10:50:21 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2019-07-03 10:50:21 +0200 |
| commit | 341924049558e5f7c1a148a2c461a417933d35d9 (patch) | |
| tree | 1340b4f2131737ef4be63f18ee74cd73ad12cd3e /arch/ia64/kernel/relocate_kernel.S | |
| parent | hrtimer: Use a bullet for the returns bullet list (diff) | |
| parent | MAINTAINERS: Fix Andy's surname and the directory entries of VDSO (diff) | |
| download | kernel-qcow2-linux-341924049558e5f7c1a148a2c461a417933d35d9.tar.gz kernel-qcow2-linux-341924049558e5f7c1a148a2c461a417933d35d9.tar.xz kernel-qcow2-linux-341924049558e5f7c1a148a2c461a417933d35d9.zip | |
Merge branch 'timers/vdso' into timers/core
so the hyper-v clocksource update can be applied.
Diffstat (limited to 'arch/ia64/kernel/relocate_kernel.S')
| -rw-r--r-- | arch/ia64/kernel/relocate_kernel.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ia64/kernel/relocate_kernel.S b/arch/ia64/kernel/relocate_kernel.S index c370e02f0061..7124fe7bec7c 100644 --- a/arch/ia64/kernel/relocate_kernel.S +++ b/arch/ia64/kernel/relocate_kernel.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * arch/ia64/kernel/relocate_kernel.S * @@ -6,9 +7,6 @@ * Copyright (C) 2005 Hewlett-Packard Development Company, L.P. * Copyright (C) 2005 Khalid Aziz <khalid.aziz@hp.com> * Copyright (C) 2005 Intel Corp, Zou Nan hai <nanhai.zou@intel.com> - * - * This source code is licensed under the GNU General Public License, - * Version 2. See the file COPYING for more details. */ #include <asm/asmmacro.h> #include <asm/kregs.h> |