Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Tue, 15 Aug 2006 09:08:30 +0000 (05:08 -0400)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 15 Aug 2006 09:08:30 +0000 (05:08 -0400)
commitcd6eb5396569bd2a3b16148f0d5277f7f4ee1391
treef587628bf43f6374ca351c295116b8b70fc90aee
parent74546aac0124a5ba09a0e6bfef18dc3e0b7509b8
parentc9900f159e8d2fd7e32070e2cd0971caf917431d
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ewok.(none):/home/gblack/m5/newmem

src/cpu/static_inst.hh:
    SCCS merged

--HG--
extra : convert_revision : a4f6377dbd691ab58fe5f7958b983b092575f250
src/cpu/static_inst.hh
src/mem/page_table.hh
src/mem/request.hh