Merge zizzer:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Thu, 25 Jan 2007 00:57:36 +0000 (19:57 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 25 Jan 2007 00:57:36 +0000 (19:57 -0500)
commit5f50dfa5d037e56e73c68f4c087491f57b52f677
treecf70c6b765bafeb489a07bd688053e0b180c6cf0
parentb8fc86e28f15b03ba82465b2a1dcf0725c769bad
parent4301e4cd08018eb56b4f196afcce9a8311f390b4
Merge zizzer:/bk/newmem
into  zower.eecs.umich.edu:/eecshome/m5/newmem

--HG--
extra : convert_revision : 2d7ae62a59b91d735bbac093f8a4ab542ea75eee
src/arch/sparc/faults.cc
src/arch/sparc/isa/decoder.isa
src/cpu/exetrace.cc