| commit | 141d3b1daacd11bdbd6fa74c2b163093e10d17ee | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Tue Nov 07 10:51:10 2017 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Tue Nov 07 10:51:10 2017 +0100 |
| tree | 04c98496f16ad2fe34c0cf4f31fedf4fe558c017 | |
| 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>