into zamp.eecs.umich.edu:/z/ktlim2/clean/m5-new arch/alpha/isa/mem.isa: Hand merge. --HG-- extra : convert_revision : c557aa4c867d84ab01139e509ee9f2ed05dd8ea0