Merge zizzer.eecs.umich.edu:/bk/newmem
authorNathan Binkert <binkertn@umich.edu>
Sat, 3 Mar 2007 15:47:00 +0000 (07:47 -0800)
committerNathan Binkert <binkertn@umich.edu>
Sat, 3 Mar 2007 15:47:00 +0000 (07:47 -0800)
into  iceaxe.int.chaotic.net:/Users/nate/work/m5/outgoing

--HG--
extra : convert_revision : b3d48721ead389fa807c0d5392039d4fc71a252e


Trivial merge