Merge ktlim@zizzer.eecs.umich.edu:/bk/m5

into zamp.eecs.umich.edu:/z/ktlim2/m5

--HG--
extra : convert_revision : a58535776cf5a3d17f8d9f65144cdf8db54289aa

diff --cc arch/alpha/isa_traits.hh
Simple merge

diff --cc cpu/base_cpu.cc
Simple merge

diff --cc cpu/simple_cpu/simple_cpu.cc
Simple merge