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

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

--HG--
extra : convert_revision : dc165840841bdd88e40111b98d1be493441703f0

diff --cc src/SConscript
Simple merge

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

diff --cc src/dev/isa_fake.hh
Simple merge