merge

--HG--
extra : convert_revision : 47425264e672f727cbb13aa7b9bb2a67790b25e8

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

diff --cc dev/alpha_console.cc
Simple merge

diff --cc dev/alpha_console.hh
Simple merge