diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:30:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:30:18 +0100 |
| commit | 15bcdc9477b03eb035052412c3a087e11e855e76 (patch) | |
| tree | e1e3c1f2b89e3a705d1737d61a4d8a9394a1930e /include/linux/platform_data/media/ir-rx51.h | |
| parent | 340b5319c98eb14f7a70947a38e17d06f5beea88 (diff) | |
| parent | e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf (diff) | |
Merge branch 'linus' into perf/core, to fix conflicts
Conflicts:
tools/perf/arch/arm/annotate/instructions.c
tools/perf/arch/arm64/annotate/instructions.c
tools/perf/arch/powerpc/annotate/instructions.c
tools/perf/arch/s390/annotate/instructions.c
tools/perf/arch/x86/tests/intel-cqm.c
tools/perf/ui/tui/progress.c
tools/perf/util/zlib.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/platform_data/media/ir-rx51.h')
| -rw-r--r-- | include/linux/platform_data/media/ir-rx51.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/platform_data/media/ir-rx51.h b/include/linux/platform_data/media/ir-rx51.h index 2c94ab568bfa..9d127aa648e7 100644 --- a/include/linux/platform_data/media/ir-rx51.h +++ b/include/linux/platform_data/media/ir-rx51.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _IR_RX51_H #define _IR_RX51_H |