Merge zeep.pool:/z/saidi/work/m5.head
authorAli Saidi <saidi@eecs.umich.edu>
Fri, 12 May 2006 22:16:07 +0000 (18:16 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Fri, 12 May 2006 22:16:07 +0000 (18:16 -0400)
commit03a00e5d32411f467735b2af890c1ca54930e949
tree4154e4703c0c3e18bd4d6b4de98fe8650d6f704d
parenta91ee5abc2275709871b016d43ca2d2440fa5000
parent7929b9ee19b6fabc7e69b704fa07fdb6daa35c70
Merge zeep.pool:/z/saidi/work/m5.head
into  zeep.pool:/z/saidi/work/m5.nm_m5_pull

SConscript:
    dram memory needs to be converted to newmem before we can use it
dev/ide_ctrl.cc:
    don't need this printing in newmem
dev/ide_disk.cc:
    will read stats in next commit
dev/sinic.cc:
    merge sinic from head, still needs work

--HG--
extra : convert_revision : b9aabd8c7814d07d54ce6f971aad3ec349fa24e1
arch/alpha/isa/decoder.isa
dev/ide_disk.hh
dev/sinic.cc
dev/sinic.hh
python/m5/objects/Ethernet.py