Merge zizzer:/z/m5/Bitkeeper/m5

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

--HG--
extra : convert_revision : 88afcacc41f5b0fae0ed1ac1821b7ca88c407e85

diff --cc cpu/base_cpu.cc
index 4325bfc176679c47bd7b1fb07047f06f25312d29,425ac8877a918b5ac58d4fbedcdfa2d1da19caa6..59804c7d5a486910ffe80b3a3dcc85c945fe4b7c
--- 1/cpu/base_cpu.cc
--- 2/cpu/base_cpu.cc
+++ b/cpu/base_cpu.cc
@@@ -33,9 -33,9 +33,10 @@@
  #include "base/cprintf.hh"
  #include "base/loader/symtab.hh"
  #include "base/misc.hh"
+ #include "base/output.hh"
  #include "cpu/base_cpu.hh"
  #include "cpu/exec_context.hh"
 +#include "cpu/sampling_cpu/sampling_cpu.hh"
  #include "sim/param.hh"
  #include "sim/sim_events.hh"