Merge gblack@m5.eecs.umich.edu:/bk/multiarch
authorGabe Black <gblack@eecs.umich.edu>
Sun, 5 Mar 2006 03:32:13 +0000 (22:32 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Sun, 5 Mar 2006 03:32:13 +0000 (22:32 -0500)
commitbc619f37aead3dfac240971c7769f064b44a3046
tree14175ee609d398411c98145c91ad1a1359403d54
parent57e051d1a559c745420e6810c8dbdb308073ef63
parentebd28075abb304bcc9f33873f32a686ffff21604
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into  ewok.(none):/home/gblack/m5/multiarch

arch/alpha/system.cc:
    Hand merged

--HG--
extra : convert_revision : 34d7608d21dc6dee3a3feed5e5671f5de6ebfa26
arch/alpha/system.cc