projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9062525 7ae8344)
Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Wed, 21 Feb 2007 00:38:11 +0000 (00:38 +0000)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 21 Feb 2007 00:38:11 +0000 (00:38 +0000)
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem

tests/long/30.eon/ref/alpha/linux/simple-timing/m5stats.txt:
    "Hand merge" that just used the local file.

--HG--
extra : convert_revision : 24c7fa192094958be5a9d17c3461f3328079fd3b


Trivial merge