diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-17 12:23:24 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-17 12:23:24 +0300 |
commit | a954e5fb4bc2d401b8fc3b4c7cd316497ff80225 (patch) | |
tree | 06af23b232c7c2e795a2fef8a5a0604ec64d5092 /include/linux/mfd/aat2870.h | |
parent | e137d34f94ebcb6508d7c8614ac045583fffbe2a (diff) | |
parent | 9e0babf2c06c73cda2c0cd37a1653d823adb40ec (diff) | |
download | linux-a954e5fb4bc2d401b8fc3b4c7cd316497ff80225.tar.xz |
Merge 5.2-rc5 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/mfd/aat2870.h')
-rw-r--r-- | include/linux/mfd/aat2870.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/include/linux/mfd/aat2870.h b/include/linux/mfd/aat2870.h index f7316c29bdec..af7267c480ee 100644 --- a/include/linux/mfd/aat2870.h +++ b/include/linux/mfd/aat2870.h @@ -1,22 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * linux/include/linux/mfd/aat2870.h * * Copyright (c) 2011, NVIDIA Corporation. * Author: Jin Park <jinyoungp@nvidia.com> - * - * 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 - * 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., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA */ #ifndef __LINUX_MFD_AAT2870_H |