diff options
author | 2017-11-03 12:30:12 +0100 | |
---|---|---|
committer | 2017-11-03 12:30:12 +0100 | |
commit | 294cbd05e32990c3b1a62be27441fc719edebbab (patch) | |
tree | 9e543bcfdaa183343f18714a256d3fd5c88d3b5c /drivers/pci/syscall.c | |
parent | perf/cgroup: Fix perf cgroup hierarchy support (diff) | |
parent | Kbuild: don't pass "-C" to preprocessor when processing linker scripts (diff) | |
download | linux-dev-294cbd05e32990c3b1a62be27441fc719edebbab.tar.xz linux-dev-294cbd05e32990c3b1a62be27441fc719edebbab.zip |
Merge branch 'linus' into perf/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/pci/syscall.c')
-rw-r--r-- | drivers/pci/syscall.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c index 9bf993e1f71e..83efa001c2e7 100644 --- a/drivers/pci/syscall.c +++ b/drivers/pci/syscall.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * pci_syscall.c * |