diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-09 10:11:21 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-09 10:11:21 +0300 |
| commit | 0154ec71d597692a0d0682b19eac4b3adfb7f3dc (patch) | |
| tree | 121b4ac35146f5696da090d3ae2534c76523e6c2 /drivers/hwmon/abx500.c | |
| parent | 9c3cef54c50d93871eaa46c28a06de8bd03fab63 (diff) | |
| parent | d1fdb6d8f6a4109a4263176c84b899076a5f8008 (diff) | |
| download | linux-0154ec71d597692a0d0682b19eac4b3adfb7f3dc.tar.xz | |
Merge 5.2-rc4 into char-misc-next
We want the char/misc driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwmon/abx500.c')
| -rw-r--r-- | drivers/hwmon/abx500.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/abx500.c b/drivers/hwmon/abx500.c index d4ad91d9f200..50e67cdd8e5e 100644 --- a/drivers/hwmon/abx500.c +++ b/drivers/hwmon/abx500.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson 2010 - 2013 * Author: Martin Persson <martin.persson@stericsson.com> * Hongbo Zhang <hongbo.zhang@linaro.org> - * License Terms: GNU General Public License v2 * * ABX500 does not provide auto ADC, so to monitor the required temperatures, * a periodic work is used. It is more important to not wake up the CPU than |