diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-05-28 09:38:59 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-05-28 09:39:08 +0200 |
| commit | 4672b1d65fc9b5a5ded911fbebb4853b892d5d89 (patch) | |
| tree | 4ddeeb9fd195ce85f0f49525b94c39bdee8b94d9 /drivers/hwmon/w83l785ts.c | |
| parent | cf57fdc8e42bd88dae1213a2bbe683d4b6c2190b (diff) | |
| parent | 14ee642c2ab0a3d8a1ded11fade692d8b77172b9 (diff) | |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
This picks up rc2 for us as well.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/hwmon/w83l785ts.c')
| -rw-r--r-- | drivers/hwmon/w83l785ts.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c index ac3043122011..6f6d925cf017 100644 --- a/drivers/hwmon/w83l785ts.c +++ b/drivers/hwmon/w83l785ts.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * w83l785ts.c - Part of lm_sensors, Linux kernel modules for hardware * monitoring @@ -14,20 +15,6 @@ * * Thanks to James Bolt <james@evilpenguin.com> for benchmarking the read * error handling mechanism. - * - * 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. - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <linux/module.h> |