summaryrefslogtreecommitdiffstats
path: root/drivers/fsi
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-23 09:23:33 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-23 09:23:33 +0200
commit8083f3d78825c0ea1948339613914b46105bfd0b (patch)
tree25319c8651919f48cbae12eb3fe7490413ff9669 /drivers/fsi
parent06b32fdb030989c45bb9dad685b794bf2395d53a (diff)
parent4b972a01a7da614b4796475f933094751a295a2f (diff)
downloadlinux-8083f3d78825c0ea1948339613914b46105bfd0b.tar.gz
linux-8083f3d78825c0ea1948339613914b46105bfd0b.tar.bz2
linux-8083f3d78825c0ea1948339613914b46105bfd0b.zip
Merge 5.2-rc6 into char-misc-next
We need the char-misc fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/fsi')
-rw-r--r--drivers/fsi/fsi-scom.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/fsi/fsi-scom.c b/drivers/fsi/fsi-scom.c
index 81dc01ac2351..343153d47e5b 100644
--- a/drivers/fsi/fsi-scom.c
+++ b/drivers/fsi/fsi-scom.c
@@ -1,16 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* SCOM FSI Client device driver
*
* Copyright (C) IBM Corporation 2016
- *
- * 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
- * MERGCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*/
#include <linux/fsi.h>