Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
authorAli Saidi <saidi@eecs.umich.edu>
Sat, 12 Mar 2005 00:34:43 +0000 (19:34 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Sat, 12 Mar 2005 00:34:43 +0000 (19:34 -0500)
commite0d52f56e12d5ef4ddbc98b173543a95f75fb68e
tree8d30fde311ce5b5a090cbe1f42446a32e1c11475
parent05e07428f103ae97f7929e3a4ed9bb7bea1eab9c
parentc977d2a02b1b3071d52fe43779730ed5290babff
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5

--HG--
rename : objects/Pci.mpy => python/m5/objects/Pci.mpy
extra : convert_revision : 6902e8f9c2a309eb1846094a94b38018587a3761
python/m5/objects/Pci.mpy