Merge zeep.eecs.umich.edu:/home/gblack/m5/newmem
authorGabe Black <gblack@eecs.umich.edu>
Wed, 8 Nov 2006 13:19:52 +0000 (08:19 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 8 Nov 2006 13:19:52 +0000 (08:19 -0500)
commitb82fa633bb9a9bf72b724dcf202985f37ab1d8b8
treea556f44237cb9cc5c8c6975607cf3fbf34a0a4f3
parentf0c4d3664930f28229c7e336c4d4372b2e1d4c21
parent635df9ba1753915002d10611308cba98527929d3
Merge zeep.eecs.umich.edu:/home/gblack/m5/newmem
into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

src/arch/sparc/faults.hh:
    Hand merged.

--HG--
extra : convert_revision : 1bcefe47fa98e878a0dfbcfa5869b5b171927911
src/arch/sparc/faults.cc
src/arch/sparc/faults.hh