Merge tag 'v5.2' into next

Sync up with mainline to resolve conflicts in iforce driver.
This commit is contained in:
Dmitry Torokhov
2019-07-15 09:42:32 -07:00
30539 changed files with 567993 additions and 479232 deletions

View File

@@ -1,12 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Elantech Touchpad driver (v6)
*
* Copyright (C) 2007-2009 Arjan Opmeer <arjan@opmeer.net>
*
* 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.
*
* Trademarks are the property of their respective owners.
*/