Merge ktlim@zizzer:/bk/m5
authorKevin Lim <ktlim@umich.edu>
Tue, 23 May 2006 21:04:25 +0000 (17:04 -0400)
committerKevin Lim <ktlim@umich.edu>
Tue, 23 May 2006 21:04:25 +0000 (17:04 -0400)
commitb414c9e736543acca639c50582c7df7abf59c11b
tree8eaa0fa7061af351955c59f0e2a525f3527f2ee7
parenteeeee7c58f26fac9fe9b8606e26ef8e99a28e399
parent358cf1b11765024309fe986262bb3a3d16c8a720
Merge ktlim@zizzer:/bk/m5
into  zamp.eecs.umich.edu:/z/ktlim2/clean/m5-o3

--HG--
extra : convert_revision : 0a6140f3f5e7c454981c5aa2b221224f076e50eb
cpu/base_dyn_inst.hh
cpu/o3/iew_impl.hh
cpu/o3/inst_queue_impl.hh