Merge from changes to Memtype and Bustype and Automerge
authorRon Dreslinski <rdreslin@umich.edu>
Wed, 12 Jan 2005 20:22:58 +0000 (15:22 -0500)
committerRon Dreslinski <rdreslin@umich.edu>
Wed, 12 Jan 2005 20:22:58 +0000 (15:22 -0500)
commit3edc239c1320b688294ff6c83b8da922e5c7f53b
tree8cbbbdbc95ecff1f02f0f587f4066d7132b2e95c
parenta435be1b00657c9bbce95fec49b242c9089715f4
parent0f0c80ad8c7ee871b848bcbc9e83f9f56fd724a4
Merge from changes to Memtype and Bustype and Automerge

--HG--
extra : convert_revision : 143fdcc333084c7ba04291e0c299f99566b73cc3