Ingo Molnar 923a789b49 Merge branch 'linus' into x86/cleanups ... Conflicts: arch/x86/kernel/reboot.c		2009-01-02 22:41:36 +01: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: Export some definition of MTRR	2008-12-31 16:51:44 +02:00
if.c	x86: mtrr_cleanup try gran_size to less than 1M, cleanup	2008-10-03 09:41:42 +02:00
main.c	Merge branch 'linus' into x86/cleanups	2009-01-02 22:41:36 +01:00
Makefile	i386: move kernel/cpu/mtrr	2007-10-11 11:16:28 +02:00
mtrr.h	x86: Export some definition of MTRR	2008-12-31 16:51:44 +02:00
state.c	x86: coding style fixes to arch/x86/kernel/cpu/mtrr/state.c	2008-04-17 17:40:49 +02:00