]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c7bf1e3 7b8e19a)
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)
commit7dd7843c90a117218747e9f3579d43dc8a91c06d
tree12f3027003f1d7cce30f838265e4fab2d52c6ceftree | snapshot
parentc7bf1e3d376cb11d251f1d29ac28e710ed2d2208commit | diff
parent7b8e19a436a5b1e21cfdfe45a563ebfe0fe8b4b4commit | 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.