Merge ktlim@zizzer:/bk/m5
authorKevin Lim <ktlim@umich.edu>
Thu, 16 Feb 2006 17:03:44 +0000 (12:03 -0500)
committerKevin Lim <ktlim@umich.edu>
Thu, 16 Feb 2006 17:03:44 +0000 (12:03 -0500)
commitc7624c26e71c1edc73a076efe472d253b199c3cc
treed36afea83d4d5f41d3a56d6a433fb9289cac305b
parent00f451cc02373a22023f1e32ba3823a1d07adb42
parent485568efa972db7fc27f34708d9bc3a2f19871de
Merge ktlim@zizzer:/bk/m5
into  zamp.eecs.umich.edu:/z/ktlim2/clean/m5-new

arch/alpha/isa/mem.isa:
    Hand merge.

--HG--
extra : convert_revision : c557aa4c867d84ab01139e509ee9f2ed05dd8ea0
arch/alpha/isa/mem.isa