]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f410770 47bdf33)
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)
commit7ce7f35b33eb42b6aa4cf176fa34372b21b8472b
tree12f3027003f1d7cce30f838265e4fab2d52c6ceftree | snapshot
parentf410770293a1fbc08906474c24104a7a11943eb6commit | diff
parent47bdf3378d62a627cfb8a54e1180c08d67078b61commit | 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 for KaRo TX COM modules