Merge zizzer.eecs.umich.edu:/n/wexford/x/gblack/m5/newmem-o3-spec
authorGabe Black <gblack@eecs.umich.edu>
Mon, 23 Apr 2007 15:34:40 +0000 (15:34 +0000)
committerGabe Black <gblack@eecs.umich.edu>
Mon, 23 Apr 2007 15:34:40 +0000 (15:34 +0000)
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-micro

--HG--
extra : convert_revision : 757e1d79033e6f8e0aaaf5ecaf14077d416cff8e


Trivial merge