diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-03 12:30:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-03 12:30:12 +0100 |
| commit | 294cbd05e32990c3b1a62be27441fc719edebbab (patch) | |
| tree | 9e543bcfdaa183343f18714a256d3fd5c88d3b5c /arch/s390/include/asm/setup.h | |
| parent | perf/cgroup: Fix perf cgroup hierarchy support (diff) | |
| parent | Kbuild: don't pass "-C" to preprocessor when processing linker scripts (diff) | |
| download | linux-294cbd05e32990c3b1a62be27441fc719edebbab.tar.xz linux-294cbd05e32990c3b1a62be27441fc719edebbab.zip | |
Merge branch 'linus' into perf/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/include/asm/setup.h')
| -rw-r--r-- | arch/s390/include/asm/setup.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h index 490e035b3716..f2c2b7cd9099 100644 --- a/arch/s390/include/asm/setup.h +++ b/arch/s390/include/asm/setup.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * S390 version * Copyright IBM Corp. 1999, 2010 |