| commit | b6466d53afdb0c3ca058848cd4c12e141aba0763 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Tue Apr 11 10:47:28 2017 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Tue Apr 11 10:47:28 2017 +0200 |
| tree | 06da4bf69879a7a26dc78d1b4f4b47ca4aaf4c74 | |
| parent | 4ffa3c977b5da2907eb294dc6d0259a02f2284aa [diff] | |
| parent | 7f00f388712b29005782bad7e4b25942620f3b9c [diff] |
Merge branch 'x86/urgent' into x86/cpu, to resolve conflict Conflicts: arch/x86/kernel/cpu/intel_rdt_schemata.c Signed-off-by: Ingo Molnar <mingo@kernel.org>