Merge zizzer:/bk/newmem

into  zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-release

--HG--
extra : convert_revision : 78ef94172884c2db0f591c54657b28be5be7f61c

src/cpu/checker/cpu.cc

@@ -38,6 +38,7 @@
 #include "cpu/simple_thread.hh"
 #include "cpu/thread_context.hh"
 #include "cpu/static_inst.hh"
+#include "mem/packet_impl.hh"
 #include "sim/byteswap.hh"
 #include "sim/sim_object.hh"
 #include "sim/stats.hh"

src/cpu/o3/lsq_unit_impl.hh

@@ -32,6 +32,7 @@
 #include "cpu/checker/cpu.hh"
 #include "cpu/o3/lsq_unit.hh"
 #include "base/str.hh"
+#include "mem/packet.hh"
 #include "mem/request.hh"
 
 template<class Impl>