Thomas Gleixner 7ce7f35b33 Merge branch 'x86/cpufeature' into x86/cache
Resolve the cpu/scattered conflict.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2016-11-16 14:19:34 +01:00
..
2016-10-11 12:52:41 -07:00
2016-06-07 22:57:10 +02:00
2016-10-19 08:39:47 -07:00
2016-10-24 19:52:24 -07:00