Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Thu, 15 Mar 2007 02:52:51 +0000 (02:52 +0000)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 15 Mar 2007 02:52:51 +0000 (02:52 +0000)
commit32368a2bd62409b303b0fcbe796fc94e4902657d
treeaf146159b4488dc9bf1c581162452a8de06a3d16
parentff90b8c1aa99711eeb55c5eba29519f77cbc041c
parenta2b56088fb4d12aee73ecfeaba88cfa46f98567e
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

src/arch/mips/utility.hh:
src/arch/x86/SConscript:
    Hand merge

--HG--
extra : convert_revision : 0ba457aab52bf6ffc9191fd1fe1006ca7704b5b0
src/arch/SConscript
src/arch/alpha/utility.hh
src/arch/mips/utility.hh
src/arch/sparc/utility.hh
src/arch/x86/SConscript
src/arch/x86/utility.hh
src/cpu/base.hh
src/cpu/simple/atomic.cc
src/cpu/simple/base.cc
src/cpu/simple/base.hh