Merge gblack@m5.eecs.umich.edu:/bk/multiarch
authorGabe Black <gblack@eecs.umich.edu>
Fri, 24 Feb 2006 23:45:28 +0000 (18:45 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 24 Feb 2006 23:45:28 +0000 (18:45 -0500)
commite66f521d5be35683fc9460b2c4d6b7fb35fad940
treee290f340b7c1d5d999ee61ca3a4db008ecdc7517
parent802fd04f640b34d713f7ef75142e51d3d82559b9
parent7a37037358ae5800d0f6a40130929669d836fe70
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into  ewok.(none):/home/gblack/m5/multiarch

SConscript:
arch/alpha/ev5.cc:
dev/alpha_console.cc:
    Hand merged

--HG--
extra : convert_revision : 318a671e6803400d3ed086a90e70d6790e4f6b19
arch/alpha/ev5.cc
cpu/simple/cpu.cc
dev/alpha_console.cc