Merge ktlim@zizzer:/bk/m5

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

--HG--
extra : convert_revision : 0a6140f3f5e7c454981c5aa2b221224f076e50eb

diff --cc cpu/base_dyn_inst.hh
Simple merge

diff --cc cpu/o3/iew_impl.hh
Simple merge

diff --cc cpu/o3/inst_queue_impl.hh
Simple merge