Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Sun, 18 Jun 2006 02:05:02 +0000 (22:05 -0400)
committerKevin Lim <ktlim@umich.edu>
Sun, 18 Jun 2006 02:05:02 +0000 (22:05 -0400)
commitbc3d009abaa0000469d5e556bd264009f7c50464
tree710dc1a50db69bd4ed5e34e44233a4974ae8d0a7
parentd91f4d172a9c9f82348899018c296eea186b2d74
parent393e77fbe94ccbcc422d2575c500d1590ca87d00
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 037fe9ee54da7e11c2bd07388b9f79cda9abef4c
SConstruct
src/cpu/SConscript
src/python/m5/__init__.py