Merge with head.

author Gabe Black <gblack@eecs.umich.edu>

Wed, 3 Oct 2007 06:03:38 +0000 (23:03 -0700)

committer Gabe Black <gblack@eecs.umich.edu>

Wed, 3 Oct 2007 06:03:38 +0000 (23:03 -0700)
author Gabe Black <gblack@eecs.umich.edu>
Wed, 3 Oct 2007 06:03:38 +0000 (23:03 -0700)
committer Gabe Black <gblack@eecs.umich.edu>
Wed, 3 Oct 2007 06:03:38 +0000 (23:03 -0700)
diff --cc src/arch/x86/tlb.cc
Simple merge
diff --cc src/cpu/simple/base.cc
Simple merge
author	Gabe Black <gblack@eecs.umich.edu>
	Wed, 3 Oct 2007 06:03:38 +0000 (23:03 -0700)
committer	Gabe Black <gblack@eecs.umich.edu>
	Wed, 3 Oct 2007 06:03:38 +0000 (23:03 -0700)
		1	2
src/arch/x86/tlb.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/cpu/simple/base.cc	patch \|	diff1 \|	diff2 \|	blob \| history