Merge zizzer:/bk/newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Thu, 12 Oct 2006 22:56:57 +0000 (18:56 -0400)
committerLisa Hsu <hsul@eecs.umich.edu>
Thu, 12 Oct 2006 22:56:57 +0000 (18:56 -0400)
commit339b1f85165df0e2654f755cc921eded3db8977c
tree256d738554e3d0a2987c9d4769313310a5ce9967
parent3d2764acf3a05a65c32e93bd18c8fe9a6e0d9ecc
parentba795552f58525e34c26a79224ff24c11145103e
Merge zizzer:/bk/newmem
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

src/cpu/simple/timing.cc:
    hand merge

--HG--
extra : convert_revision : 083bf102249ad9bc63c447dbf85d3863f935f647
src/cpu/simple/timing.cc