diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-07-20 06:07:56 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-07-20 06:07:56 +0200 |
commit | c39f2d9db0fd81ea20bb5cce9b3f082ca63753e2 (patch) | |
tree | 8e80ed5601b4fb8880a2ca8e08802bc8b1f850bd /drivers/input/misc/ab8500-ponkey.c | |
parent | Merge branch 'next' into for-linus (diff) | |
parent | Input: alps - fix a mismatch between a condition check and its comment (diff) | |
download | linux-c39f2d9db0fd81ea20bb5cce9b3f082ca63753e2.tar.xz linux-c39f2d9db0fd81ea20bb5cce9b3f082ca63753e2.zip |
Merge branch 'next' into for-linus
Prepare second round of input updates for 5.3 merge window.
Diffstat (limited to 'drivers/input/misc/ab8500-ponkey.c')
-rw-r--r-- | drivers/input/misc/ab8500-ponkey.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c index a33ed5710b15..12b18a8db315 100644 --- a/drivers/input/misc/ab8500-ponkey.c +++ b/drivers/input/misc/ab8500-ponkey.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: Sundar Iyer <sundar.iyer@stericsson.com> for ST-Ericsson * * AB8500 Power-On Key handler |