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
..
asm	Merge branch 'x86/cpufeature' into x86/cache	2016-11-16 14:19:34 +01:00
uapi/asm	Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-10-03 17:29:01 -07:00