Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Fri, 7 Jul 2006 20:47:28 +0000 (16:47 -0400)
committerKevin Lim <ktlim@umich.edu>
Fri, 7 Jul 2006 20:47:28 +0000 (16:47 -0400)
commitb2a479cfc89e3109830bd285b0819b6a0b56cbf4
tree32ea9fd57f6c2bf90c31e62fab7a755f65f408b9
parent1faada9bd98a6425624a97813d4c8cdc5b78aa1f
parent7811500eefc57d8f9f00845b9187d9a1a6ef6655
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : e8933f852352164f4e50444f94cc6ee260e06766
src/cpu/simple/timing.cc
src/cpu/simple/timing.hh