Merge zizzer:/bk/newmem

into  zower.eecs.umich.edu:/eecshome/m5/newmem

--HG--
extra : convert_revision : 2d7ae62a59b91d735bbac093f8a4ab542ea75eee

diff --cc src/arch/sparc/faults.cc
Simple merge

diff --cc src/arch/sparc/isa/decoder.isa
Simple merge

diff --cc src/cpu/exetrace.cc
Simple merge