diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-07-03 11:50:21 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-07-03 11:50:21 +0300 |
| commit | 341924049558e5f7c1a148a2c461a417933d35d9 (patch) | |
| tree | 1340b4f2131737ef4be63f18ee74cd73ad12cd3e /arch/x86/boot/cmdline.c | |
| parent | 516337048fa40496ae5ca9863c367ec991a44d9a (diff) | |
| parent | 4a8f81b8c053aad250ee247b219904ada72df9a4 (diff) | |
| download | linux-341924049558e5f7c1a148a2c461a417933d35d9.tar.xz | |
Merge branch 'timers/vdso' into timers/core
so the hyper-v clocksource update can be applied.
Diffstat (limited to 'arch/x86/boot/cmdline.c')
| -rw-r--r-- | arch/x86/boot/cmdline.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/boot/cmdline.c b/arch/x86/boot/cmdline.c index 625d21b0cd3f..4ff01176c1cc 100644 --- a/arch/x86/boot/cmdline.c +++ b/arch/x86/boot/cmdline.c @@ -1,11 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* -*- linux-c -*- ------------------------------------------------------- * * * Copyright (C) 1991, 1992 Linus Torvalds * Copyright 2007 rPath, Inc. - All Rights Reserved * - * This file is part of the Linux kernel, and is made available under - * the terms of the GNU General Public License version 2. - * * ----------------------------------------------------------------------- */ /* |