Merge with head
authorGabe Black <gblack@eecs.umich.edu>
Mon, 27 Aug 2007 04:45:40 +0000 (21:45 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Mon, 27 Aug 2007 04:45:40 +0000 (21:45 -0700)
commit7227ab5f223eb5f4d3ce80ea16bff5f87c3300b6
tree3f6c407eccafc56c85a6077fd05f4e98f7e6f034
parent8d1c7a83d7c052ba312a21ff6c6b8967b1e4b5f4
Merge with head

--HG--
extra : convert_revision : cc73b9aaf73e9dacf52f3350fa591e67ca4ccee6
15 files changed:
src/cpu/o3/fetch_impl.hh
src/cpu/o3/lsq_impl.hh
src/cpu/o3/lsq_unit_impl.hh
src/cpu/simple/atomic.cc
src/cpu/simple/timing.cc
src/dev/alpha/console.cc
src/dev/i8254xGBe.cc
src/dev/i8254xGBe.hh
src/dev/isa_fake.cc
src/mem/bridge.cc
src/mem/bridge.hh
src/mem/bus.cc
src/mem/cache/cache_impl.hh
src/mem/packet.cc
src/mem/packet.hh