Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Fri, 18 May 2007 20:36:47 +0000 (13:36 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 18 May 2007 20:36:47 +0000 (13:36 -0700)
commita13d5af274a1847eaad649af226e643e86a3322d
tree6b3bdd0b269802b324b4744e6ed8362d1917e1a0
parent6a6e62014ec72f9dd29a42c3e92fbc91d6b1f648
parenta8278c3bde2ba9abc2820afafa9d0e766e36b2c8
Merge zizzer.eecs.umich.edu:/bk/newmem
into  doughnut.mwconnections.com:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : 3f17fc418ee5a30da2b08a515fb394cc8fcdd237
src/arch/alpha/tlb.cc
src/cpu/simple/base.cc