android_kernel_motorola_sm6225/arch/x86/kernel/cpu/mtrr
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
..
amd.c x86: mtrr use type bool [RESEND AGAIN] 2008-01-30 13:30:31 +01:00
centaur.c i386: move kernel/cpu/mtrr 2007-10-11 11:16:28 +02:00
cyrix.c x86: remove long dead cyrix mtrr code 2008-02-04 16:48:01 +01:00
generic.c x86: work around MTRR mask setting, v2 2008-08-22 14:12:31 +02:00
if.c proc: remove proc_root from drivers 2008-04-29 08:06:18 -07:00
main.c Merge branch 'x86/cpu' into x86/core 2008-09-04 08:08:42 -07:00
Makefile i386: move kernel/cpu/mtrr 2007-10-11 11:16:28 +02:00
mtrr.h x86: mtrr cleanup for converting continuous to discrete layout, v8 2008-05-25 10:55:09 +02:00
state.c x86: coding style fixes to arch/x86/kernel/cpu/mtrr/state.c 2008-04-17 17:40:49 +02:00