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/x86/kvm/x86.c | |
| 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/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 81a0914a1ec1..8ec676029365 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Kernel-based Virtual Machine driver for Linux * @@ -13,10 +14,6 @@ * Yaniv Kamay <yaniv@qumranet.com> * Amit Shah <amit.shah@qumranet.com> * Ben-Ami Yassour <benami@il.ibm.com> - * - * This work is licensed under the terms of the GNU GPL, version 2. See - * the COPYING file in the top-level directory. - * */ #include <linux/kvm_host.h> |