Merge zizzer:/bk/m5

into  zeep.eecs.umich.edu:/z/saidi/work/m5.q

--HG--
extra : convert_revision : 4855ecfb3de652456a8be413c9e538c91709dcb6

diff --cc arch/alpha/isa/decoder.isa
Simple merge

diff --cc cpu/exec_context.cc
Simple merge

diff --cc cpu/exec_context.hh
Simple merge

diff --cc sim/pseudo_inst.cc
Simple merge