Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Thu, 31 May 2007 20:45:04 +0000 (20:45 +0000)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 31 May 2007 20:45:04 +0000 (20:45 +0000)
commitc432588981c2903fda4b00bf03ada3c2c04063f7
tree6230df1fe2f4032ef76973f8debcccfed6830285
parent62fde97bb2e40002e59d0185db419f6f72643a6f
parent6b6de8aaae86ea8b0f416a175c547fc67bea804a
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

src/cpu/simple/base.cc:
    Hand merge

--HG--
extra : convert_revision : a2902ef9d917d22ffb9c7dfa2fd444694a65240d
src/cpu/simple/base.cc