Gabe Black e66f521d5b 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

2006-02-24 18:45:28 -05:00

..

cpu.cc

Merge gblack@m5.eecs.umich.edu:/bk/multiarch

2006-02-24 18:45:28 -05:00

cpu.hh

Merge zizzer:/bk/m5

2006-02-23 15:06:06 -05:00