Merge ktlim@zizzer:/bk/newmem

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

--HG--
extra : convert_revision : 161c35ade82f2471e605d948dca56cfa216693fd

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

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

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