projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4ffa3c9 7f00f38)
Merge branch 'x86/urgent' into x86/cpu, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Tue, 11 Apr 2017 08:47:28 +0000 (10:47 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 11 Apr 2017 08:47:28 +0000 (10:47 +0200)
commitb6466d53afdb0c3ca058848cd4c12e141aba0763
tree06da4bf69879a7a26dc78d1b4f4b47ca4aaf4c74tree | snapshot (tar.gz zip)
parent4ffa3c977b5da2907eb294dc6d0259a02f2284aacommit | diff
parent7f00f388712b29005782bad7e4b25942620f3b9ccommit | 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>
arch/x86/kernel/cpu/intel_rdt_rdtgroup.c diff1 | diff2 | blob | history