Merge zizzer:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Wed, 6 Dec 2006 11:05:28 +0000 (06:05 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 6 Dec 2006 11:05:28 +0000 (06:05 -0500)
commit2dcf00bc8b6ca0bdfc8ab9a105f7a7780c763bb4
treec34b7e7417d0c95255def0cea2a48a72229da344
parentbe29adf51cb115e7e55321bd58b7f6593e6d0080
parent54a946604b2fa81c0d58fc41bfe1d82840f44793
Merge zizzer:/bk/newmem
into  zower.eecs.umich.edu:/eecshome/m5/newmem

src/cpu/o3/commit_impl.hh:
    Hand Merge

--HG--
extra : convert_revision : 6984db90d5b5ec71c31f1c345f5a77eed540059e
src/cpu/o3/commit_impl.hh
src/cpu/o3/fetch_impl.hh
src/cpu/o3/thread_context_impl.hh
src/cpu/thread_context.hh