Merge zizzer:/bk/newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Thu, 1 Feb 2007 20:35:26 +0000 (15:35 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Thu, 1 Feb 2007 20:35:26 +0000 (15:35 -0500)
into  zed.eecs.umich.edu:/z/hsul/work/sparc/x86.m5

--HG--
extra : convert_revision : 62a0017a1147631513db7878f4e4d08fca776bc1


Trivial merge