diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 04:51:10 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 04:51:10 -0500 |
| commit | 141d3b1daacd11bdbd6fa74c2b163093e10d17ee (patch) | |
| tree | 04c98496f16ad2fe34c0cf4f31fedf4fe558c017 /scripts/gcc-plugins/gcc-generate-rtl-pass.h | |
| parent | c201c91799d687c0a6d8c3272950f51aad5ffebe (diff) | |
| parent | e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf (diff) | |
Merge branch 'linus' into x86/apic, to resolve conflicts
Conflicts:
arch/x86/include/asm/x2apic.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/gcc-plugins/gcc-generate-rtl-pass.h')
| -rw-r--r-- | scripts/gcc-plugins/gcc-generate-rtl-pass.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/gcc-plugins/gcc-generate-rtl-pass.h b/scripts/gcc-plugins/gcc-generate-rtl-pass.h index 1dc67a5aeadf..d69cd80b6c10 100644 --- a/scripts/gcc-plugins/gcc-generate-rtl-pass.h +++ b/scripts/gcc-plugins/gcc-generate-rtl-pass.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 1 | /* | 2 | /* |
| 2 | * Generator for RTL pass related boilerplate code/data | 3 | * Generator for RTL pass related boilerplate code/data |
| 3 | * | 4 | * |