diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:50:18 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:50:18 +0200 |
commit | 26b73da3604cc1a6596406d136b14d1a01c3676f (patch) | |
tree | c7839809e35fce4868910742157e8ef96782b378 /drivers/parisc/superio.c | |
parent | 5ca584d935c32906d114924dc0e1dbfcbb13fdb2 (diff) | |
parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) |
Merge tag 'v5.2-rc3' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/parisc/superio.c')
-rw-r--r-- | drivers/parisc/superio.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c index 0441777fc777..e973c6893203 100644 --- a/drivers/parisc/superio.c +++ b/drivers/parisc/superio.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* National Semiconductor NS87560UBD Super I/O controller used in * HP [BCJ]x000 workstations. * @@ -14,11 +15,6 @@ * (C) Copyright 2005 Kyle McMartin <kyle@parisc-linux.org> * (C) Copyright 2006 Helge Deller <deller@gmx.de> * - * 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 of - * the License, or (at your option) any later version. - * * The initial version of this is by Martin Peterson. Alex deVries * has spent a bit of time trying to coax it into working. * |