Merge zizzer:/bk/newmem

into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

src/cpu/simple/timing.cc:
    hand merge

--HG--
extra : convert_revision : 083bf102249ad9bc63c447dbf85d3863f935f647

diff --cc src/cpu/simple/timing.cc
index 33f673cbcf23823c859bf5304445553d2908a84e,88aa882e31e60ecbc9a0fc435d3952db88925294..ad5c0e5d640990733c7069e38a4270c99f275944
--- 1/src/cpu/simple/timing.cc
--- 2/src/cpu/simple/timing.cc
+++ b/src/cpu/simple/timing.cc
@@@ -160,9 -161,7 +162,8 @@@ TimingSimpleCPU::resume(
          fetchEvent->schedule(curTick);
      }
  
-     assert(system->getMemoryMode() == System::Timing);
      changeState(SimObject::Running);
 +    previousTick = curTick;
  }
  
  void