diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-08 10:17:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-08 10:17:15 +0100 |
| commit | 8a103df440afea30c91ebd42e61dc644e647f4bd (patch) | |
| tree | 2cfa99e9c6e1e138e1404bce4294e46cb0034cce /samples/hidraw | |
| parent | a9903f04e0a4ea522d959c2f287cdf0ab029e324 (diff) | |
| parent | fbc3edf7d7731d7a22c483c679700589bab936a3 (diff) | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'samples/hidraw')
| -rw-r--r-- | samples/hidraw/Makefile | 1 | ||||
| -rw-r--r-- | samples/hidraw/hid-example.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/samples/hidraw/Makefile b/samples/hidraw/Makefile index a9ab96188fbe..f5c3012ffa79 100644 --- a/samples/hidraw/Makefile +++ b/samples/hidraw/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # kbuild trick to avoid linker error. Can be omitted if a module is built. obj- := dummy.o diff --git a/samples/hidraw/hid-example.c b/samples/hidraw/hid-example.c index 92e6c1511910..9bfd8ff6de82 100644 --- a/samples/hidraw/hid-example.c +++ b/samples/hidraw/hid-example.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Hidraw Userspace Example * |