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

diff --cc src/cpu/static_inst.hh
Simple merge

diff --cc src/mem/page_table.hh
Simple merge

diff --cc src/mem/request.hh
Simple merge