Merge vm1.(none):/home/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Mon, 18 Jun 2007 00:30:24 +0000 (17:30 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Mon, 18 Jun 2007 00:30:24 +0000 (17:30 -0700)
commitd69a763833f911cb2d7f97604108219b4da0b881
tree538d12c555824c931a3ceaedea5a2f46aa4e5212
parentc2a97387cf543061bdb02f5259875b10a4dd6f74
parent35cf19d441ed15d054d00674ec67ab5bc769f6d7
Merge vm1.(none):/home/stever/bk/newmem-head
into  vm1.(none):/home/stever/bk/newmem-cache2

configs/example/memtest.py:
    Hand merge redundant changes.

--HG--
extra : convert_revision : a2e36be254bf052024f37bcb23b5209f367d37e1
src/mem/bus.cc
src/mem/bus.hh