summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/ab8500-gpadc.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-03 13:53:20 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-03 13:53:20 +0200
commit888dc273ea4e7ca332a6f73d10dfc8f2b212c803 (patch)
tree0c2154dfa92ca6ee761c358e58a3e35831558bb5 /drivers/mfd/ab8500-gpadc.c
parenttty: cpm_uart: drop unused iflag macro (diff)
parentLinux 5.2-rc3 (diff)
downloadlinux-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.tar.xz
linux-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.zip
Merge 5.2-rc3 into tty-next
We want the tty/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mfd/ab8500-gpadc.c')
-rw-r--r--drivers/mfd/ab8500-gpadc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
index f4e94869d612..005f9ee34cd1 100644
--- a/drivers/mfd/ab8500-gpadc.c
+++ b/drivers/mfd/ab8500-gpadc.c
@@ -1,7 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (C) ST-Ericsson SA 2010
*
- * License Terms: GNU General Public License v2
* Author: Arun R Murthy <arun.murthy@stericsson.com>
* Author: Daniel Willerud <daniel.willerud@stericsson.com>
* Author: Johan Palsson <johan.palsson@stericsson.com>