Fix for slightly mangled merge.
authorGabe Black <gblack@eecs.umich.edu>
Wed, 8 Nov 2006 13:25:37 +0000 (08:25 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 8 Nov 2006 13:25:37 +0000 (08:25 -0500)
commit9375caa3f1ac8ff8fe5bcf3b7de1f51a20b6cd91
treeff8fcf1ed53f65aa3655c77c2934bb5312f19e9d
parentb82fa633bb9a9bf72b724dcf202985f37ab1d8b8
Fix for slightly mangled merge.

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