Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Thu, 2 Nov 2006 20:20:47 +0000 (15:20 -0500)
committerKevin Lim <ktlim@umich.edu>
Thu, 2 Nov 2006 20:20:47 +0000 (15:20 -0500)
commite71ccde66369951c23eb20281c68a8cb66c4a504
tree209293eb44ceeee7eb04bc778956f57ae812978b
parent683d8f0831b476a906dc2720265a2334ba0117e3
parent45363ea658251df0c31a75d7bd5d0ac3a3809623
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix

--HG--
extra : convert_revision : a9a41e2c292bd95aa148e1cf4d9a77c0622a462b
src/cpu/simple_thread.cc
src/cpu/simple_thread.hh
src/mem/bus.cc
src/mem/bus.hh