Merge ktlim@zizzer:/bk/newmem

into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 0e4c7684879b8552908e0b64a00b4824de807244

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

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