android_kernel_xiaomi_sdm845/include/asm-x86/xen
H. Peter Anvin 7203781c98 Merge branch 'x86/cpu' into x86/core
Conflicts:

	arch/x86/kernel/cpu/feature_names.c
	include/asm-x86/cpufeature.h
2008-09-04 08:08:42 -07:00
..
events.h x86: consolidate header guards 2008-07-22 21:31:34 +02:00
grant_table.h x86: consolidate header guards 2008-07-22 21:31:34 +02:00
hypercall.h x86: consolidate header guards 2008-07-22 21:31:34 +02:00
hypervisor.h Merge branch 'x86/cpu' into x86/core 2008-09-04 08:08:42 -07:00
interface_32.h x86: consolidate header guards 2008-07-22 21:31:34 +02:00
interface_64.h x86: consolidate header guards 2008-07-22 21:31:34 +02:00
interface.h x86: consolidate header guards 2008-07-22 21:31:34 +02:00
page.h Merge branch 'linus' into x86/header-guards 2008-07-26 15:30:40 +02:00