]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 81793d3 3924271)
Merge branch 'x86/cpufeature' into x86/cache
authorThomas Gleixner <tglx@linutronix.de>
Wed, 16 Nov 2016 13:19:34 +0000 (14:19 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 16 Nov 2016 13:19:34 +0000 (14:19 +0100)
commit8160ada8ff785eace316972980f13f4cdadeef33
tree12f3027003f1d7cce30f838265e4fab2d52c6ceftree | snapshot
parent81793d3e8d1a1ec7dc7ccc44677becc6eccf7243commit | diff
parent3924271d2e9f969fd65272871fb68f40c16eb35dcommit | diff
Merge branch 'x86/cpufeature' into x86/cache

Resolve the cpu/scattered conflict.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
MAINTAINERS diff1 | diff2 | blob | history
arch/x86/kernel/cpu/scattered.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.