diff options
| author |   Jonathan Corbet <corbet@lwn.net> | 2019-06-14 14:18:53 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2019-06-14 14:18:53 -0600 |
| commit | 8afecfb0ec961e37e61b2d19c4fa71617a9482de (patch) | |
| tree | c43ea51a47b1e76b762caa4c1b0c356249e5e874 /arch/x86/kernel/cpu/mce/apei.c | |
| parent | Documentation: Remove duplicate x86 index entry (diff) | |
| parent | Linux 5.2-rc4 (diff) | |
| download | linux-dev-8afecfb0ec961e37e61b2d19c4fa71617a9482de.tar.xz linux-dev-8afecfb0ec961e37e61b2d19c4fa71617a9482de.zip | |
Merge tag 'v5.2-rc4' into mauro
We need to pick up post-rc1 changes to various document files so they don't
get lost in Mauro's massive RST conversion push.
Diffstat (limited to 'arch/x86/kernel/cpu/mce/apei.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mce/apei.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/x86/kernel/cpu/mce/apei.c b/arch/x86/kernel/cpu/mce/apei.c index c038e5c00a59..af8d37962586 100644 --- a/arch/x86/kernel/cpu/mce/apei.c +++ b/arch/x86/kernel/cpu/mce/apei.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Bridge between MCE and APEI * @@ -13,19 +14,6 @@ * * Copyright 2010 Intel Corp. * Author: Huang Ying <ying.huang@intel.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License version - * 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <linux/export.h> |