Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Sun, 4 Mar 2007 00:03:22 +0000 (19:03 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Sun, 4 Mar 2007 00:03:22 +0000 (19:03 -0500)
into  zeep.pool:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : fd6464c9883783c7c2cbefba317f4a0f20dd24cb

1  2 
src/arch/sparc/faults.cc
src/arch/sparc/faults.hh

Simple merge
Simple merge