diff options
author | Joerg Roedel <jroedel@suse.de> | 2019-06-03 13:00:40 +0200 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2019-06-03 13:00:40 +0200 |
commit | 2de03c11171544bd23e18539f65b3b561d57ff76 (patch) | |
tree | e207052e8cbb53f587c260617c16f97fa9f7d05d /drivers/pnp/pnpacpi/core.c | |
parent | e314a7c92b3217e893cbe03b944c7afc9cbd3e4c (diff) | |
parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
download | blackbird-op-linux-2de03c11171544bd23e18539f65b3b561d57ff76.tar.gz blackbird-op-linux-2de03c11171544bd23e18539f65b3b561d57ff76.zip |
Merge tag 'v5.2-rc3' into x86/vt-d
Linux 5.2-rc3
Diffstat (limited to 'drivers/pnp/pnpacpi/core.c')
-rw-r--r-- | drivers/pnp/pnpacpi/core.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index 3a4c1aa0201e..afaf30a3622c 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c @@ -1,22 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * pnpacpi -- PnP ACPI driver * * Copyright (c) 2004 Matthieu Castet <castet.matthieu@free.fr> * Copyright (c) 2004 Li Shaohua <shaohua.li@intel.com> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2, or (at your option) any - * later version. - * - * 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> |