diff options
| author | Greg Kroah-Hartman | 2019-06-23 09:21:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-06-23 09:21:15 +0200 |
| commit | 58ee01007c9e00531c1280b2d99b49d29a5e9844 (patch) | |
| tree | d1feb7102591a811b4458e2e209d476580ae3687 /arch/x86/kernel/verify_cpu.S | |
| parent | usb: clean up some of the computations in adu_read (diff) | |
| parent | Linux 5.2-rc6 (diff) | |
| download | kernel-qcow2-linux-58ee01007c9e00531c1280b2d99b49d29a5e9844.tar.gz kernel-qcow2-linux-58ee01007c9e00531c1280b2d99b49d29a5e9844.tar.xz kernel-qcow2-linux-58ee01007c9e00531c1280b2d99b49d29a5e9844.zip | |
Merge 5.2-rc6 into usb-next
We need the USB fixes in here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kernel/verify_cpu.S')
| -rw-r--r-- | arch/x86/kernel/verify_cpu.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S index 3d3c2f71f617..a024c4f7ba56 100644 --- a/arch/x86/kernel/verify_cpu.S +++ b/arch/x86/kernel/verify_cpu.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * * verify_cpu.S - Code for cpu long mode and SSE verification. This @@ -9,9 +10,6 @@ * Copyright (c) 2007 Vivek Goyal (vgoyal@in.ibm.com) * Copyright (c) 2010 Kees Cook (kees.cook@canonical.com) * - * This source code is licensed under the GNU General Public License, - * Version 2. See the file COPYING for more details. - * * This is a common code for verification whether CPU supports * long mode and SSE or not. It is not called directly instead this * file is included at various places and compiled in that context. |