linux/include/asm-x86/uv
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
..
bios.h x86: consolidate header guards 2008-07-22 21:31:34 +02:00
uv_bau.h Merge branch 'x86/cpu' into x86/core 2008-09-04 08:08:42 -07:00
uv_hub.h x86: consolidate header guards 2008-07-22 21:31:34 +02:00
uv_mmrs.h x86: consolidate header guards 2008-07-22 21:31:34 +02:00