first pass at merging m5 with linux

--HG--
extra : convert_revision : dfe23349b80ae3b34d3cb95c5734e01ef62f700e

diff --cc arch/alpha/alpha_memory.cc
Simple merge

diff --cc base/loader/elf_object.cc
Simple merge

diff --cc cpu/base_cpu.cc
Simple merge

diff --cc kern/tru64/tru64_system.cc
Simple merge

diff --cc sim/sim_object.cc
index 2ec588afacefe1f55c431a3a3ac614ec29e0879f,9626c54ea7299533430e7962a7b0b7016a83dd3c..5602a89a230d770887c7a44f7d2eaa28af8bbd03
--- 1/sim/sim_object.cc
--- 2/sim/sim_object.cc
+++ b/sim/sim_object.cc
@@@ -35,8 -35,7 +35,8 @@@
  #include "sim/configfile.hh"
  #include "sim/host.hh"
  #include "sim/sim_object.hh"
- #include "sim/sim_stats.hh"
+ #include "sim/stats.hh"
 +#include "sim/param.hh"
  
  using namespace std;
  

diff --cc sim/system.hh
Simple merge