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
..
evm
2015-05-06 10:28:39 -04:00
2013-03-23 16:11:31 -07:00
2012-04-23 14:23:32 +03:00
2016-08-24 23:49:17 +02:00
2015-06-25 17:00:38 -07:00
2015-12-16 00:21:40 +08:00
2013-10-17 00:36:06 +02:00
2015-04-30 22:15:04 +01:00
2012-06-25 13:48:15 +02:00
2015-12-08 14:50:12 +01:00