Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Wed, 3 Oct 2007 06:03:38 +0000 (23:03 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 3 Oct 2007 06:03:38 +0000 (23:03 -0700)
commit50e2d20cb876a054f53162e7b01306039c213457
tree6e7de959159434e1501ab928bdfbebc91388b353
parentc2d60abf52fc81119970ab0617f9a979f1377685
parent7571e8346d0ebbc38806c30a75dbcf298d50f08e
Merge with head.

--HG--
extra : convert_revision : 1aa0e4569a7c10e6a395c2c951ac29275b5bcf59
src/arch/x86/tlb.cc
src/cpu/simple/base.cc