Merge gblack@m5.eecs.umich.edu:/bk/multiarch
authorGabe Black <gblack@eecs.umich.edu>
Thu, 16 Feb 2006 06:25:48 +0000 (01:25 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 16 Feb 2006 06:25:48 +0000 (01:25 -0500)
commitb161d2a731ec7d75bdeb896d1b89efcbb125a09f
treea1a92378afb4d05e8c9e2d047c1c9edbcc9e3447
parent7f17f1f2df7dc7123448ec624a345ee7c0e996b5
parent10c79efe556697ebbed74c82214b5505b405da5b
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into  ewok.(none):/home/gblack/m5/multiarch

--HG--
extra : convert_revision : d8626acb2686e123ad0bb6cf94e85c992657470d
arch/alpha/isa/main.isa
arch/alpha/isa/mem.isa
sim/syscall_emul.hh