Merge zizzer.eecs.umich.edu:/bk/newmem

into  vm1.(none):/home/stever/bk/newmem-head

--HG--
extra : convert_revision : c2350e01a052114a264f26551b13fca03a835c61

diff --cc src/mem/cache/cache_impl.hh
Simple merge

diff --cc src/mem/packet.hh
index 60f6e9ae0874ec8f4e2dfa0b3112748b040e7fdb,a4c003e8b461e0511f8453864f1ad66a3c79dcbc..65d2207db54be7475d779a6b95403feebf5d0a6c
--- 1/src/mem/packet.hh
--- 2/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@@ -40,8 -40,8 +40,9 @@@
  
  #include <cassert>
  #include <list>
 +#include <bitset>
  
+ #include "base/compiler.hh"
  #include "base/misc.hh"
  #include "mem/request.hh"
  #include "sim/host.hh"