pull from head before pushing linux tree

--HG--
extra : convert_revision : 345f91c5c16c69db22035dc716e82fd77041380f

diff --cc arch/alpha/alpha_memory.cc
Simple merge

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

diff --cc arch/alpha/isa_desc
Simple merge

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

diff --cc base/misc.cc
Simple merge

diff --cc base/traceflags.py
Simple merge

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

diff --cc cpu/static_inst.hh
Simple merge

diff --cc sim/main.cc
Simple merge