Merge zizzer.eecs.umich.edu:/bk/newmem

into  zeep.eecs.umich.edu:/home/gblack/m5/newmem

--HG--
extra : convert_revision : 30b2475ba034550376455e1bc0e52e19a200fd5a

diff --cc src/cpu/o3/fetch_impl.hh
Simple merge

diff --cc src/cpu/ozone/front_end_impl.hh
Simple merge

diff --cc src/kern/tru64/tru64.hh
Simple merge