diff options
author | Dmitry Torokhov | 2020-04-06 20:56:50 -0700 |
---|---|---|
committer | Dmitry Torokhov | 2020-04-06 20:56:50 -0700 |
commit | cd510679f4b588b7726fc8b25e5a0afd6f889b14 (patch) | |
tree | 5f4dcae0633b0b7dce8684cfb6e2ee527d6b78f1 /include | |
parent | 4134252ab7e2c339a54302b88496cb5a89cdbaec (diff) | |
parent | 3a8579629665bd6c0b37afcb2291080e959b885d (diff) |
Merge branch 'next' into for-linus
Prepare input updates for 5.7 merge window.
Diffstat (limited to 'include')
-rw-r--r-- | include/uapi/linux/input-event-codes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h index 6923dc7e0298..b6a835d37826 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * Input event codes * |