Merge zizzer:/z/m5/Bitkeeper/newmem

into  zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/newmem

src/python/m5/objects/BaseCPU.py:
    Merge duplicate change

--HG--
extra : convert_revision : 214e57999ee78aadfc86e1f0b7198ff0d981ce16

diff --cc src/mem/packet.hh
Simple merge

diff --cc src/python/m5/objects/BaseCPU.py
Simple merge

diff --cc tests/configs/simple-timing.py
index 9a5b20e88e818a87f4ebbfc801b19ab23eef6e4c,78dfabe3bd54f8be14d9e9bff52203f8e2548994..7bb76db0e498b8b337451d16ea10b4974d261e14
--- 1/tests/configs/simple-timing.py
--- 2/tests/configs/simple-timing.py
+++ b/tests/configs/simple-timing.py
@@@ -40,7 -40,6 +40,7 @@@ cpu = TimingSimpleCPU(
  cpu.addTwoLevelCacheHierarchy(MyCache(size = '128kB'), MyCache(size = '256kB'),
                                MyCache(size = '2MB'))
  cpu.mem = cpu.dcache
- 
++cpu.mem = cpu.dcache
  system = System(cpu = cpu,
                  physmem = PhysicalMemory(),
                  membus = Bus())