Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Tue, 31 Oct 2006 19:37:19 +0000 (14:37 -0500)
committerKevin Lim <ktlim@umich.edu>
Tue, 31 Oct 2006 19:37:19 +0000 (14:37 -0500)
commit5825a6c9d82b813d983b688da5f1ce18c90f774f
treea5be1a1c3968ff57d387523f95e46bcb2797c121
parent7f39644609e19ada9e94c9bbb09c3e625fa6e8ed
parentbfd5eb2b08dad700d085a637d5e16a61dcc530d7
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix

configs/example/fs.py:
configs/example/se.py:
src/mem/tport.hh:
    Hand merge.

--HG--
extra : convert_revision : b9df95534d43b3b311f24ae24717371d03d615bf
configs/example/fs.py
configs/example/se.py
src/cpu/ozone/front_end_impl.hh
src/cpu/ozone/thread_state.hh
src/cpu/simple/atomic.cc
src/cpu/simple/base.cc
src/cpu/thread_state.cc
src/mem/tport.hh