summaryrefslogtreecommitdiff
path: root/tests/diff-out
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-02-21 00:38:11 +0000
committerGabe Black <gblack@eecs.umich.edu>2007-02-21 00:38:11 +0000
commit3afbf306f47152f2a9cacbe972797bd9cb6910fd (patch)
tree004fa56d73c581d78d0c83ceefd2fe90232815c2 /tests/diff-out
parent9062525c239ba94083d6517ebff0aa88ab82be92 (diff)
parent7ae834446d3ee8b5ded269c21e88e6cdcdd6522f (diff)
downloadgem5-3afbf306f47152f2a9cacbe972797bd9cb6910fd.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem
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
Diffstat (limited to 'tests/diff-out')
0 files changed, 0 insertions, 0 deletions