Merge m5.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Fri, 17 Mar 2006 19:23:48 +0000 (14:23 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 17 Mar 2006 19:23:48 +0000 (14:23 -0500)
commitcf2f7e13bc26b8817f4378701b8fb5f7c67b3da2
tree805f0617a04dd2c265e3ab451f5177c359a169e0
parentcf942425393dbd7ac3d05a9c94aab5140d0bf617
parentc1a1f8ee95a6ed644838db06474801ba4b7bf124
Merge m5.eecs.umich.edu:/bk/newmem
into  ewok.(none):/home/gblack/m5/newmem

arch/sparc/isa/decoder.isa:
    Hand merged

--HG--
extra : convert_revision : 5d5338602c48be48978972a091c5e93f9dd775aa
arch/sparc/isa/decoder.isa