Merge saidi@zizzer.eecs.umich.edu:/bk/linux

into ali-saidis-computer.local:/research/linux

--HG--
extra : convert_revision : 446dc5fad11a6b29954dc5b1e974430853aa2969

diff --cc base/inifile.cc
Simple merge

diff --cc base/intmath.hh
Simple merge

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

diff --cc base/stats/text.cc
Simple merge

diff --cc cpu/exec_context.hh
index 08879b3b5e12cf2280d041d79a53bd4667793029,4f62fa6fae6c2477d9a24f882b078763bee610cd..b47f5cd081b3ae827c841022be6ad6f76e478753
--- 1/cpu/exec_context.hh
--- 2/cpu/exec_context.hh
+++ b/cpu/exec_context.hh
@@@ -31,8 -31,8 +31,9 @@@
  
  #include "sim/host.hh"
  #include "mem/mem_req.hh"
 +#include "mem/functional_mem/functional_memory.hh"
  #include "sim/serialize.hh"
+ #include "targetarch/byte_swap.hh"
  
  // forward declaration: see functional_memory.hh
  class FunctionalMemory;

diff --cc cpu/simple_cpu/simple_cpu.cc
Simple merge

diff --cc dev/alpha_console.cc
Simple merge

diff --cc dev/alpha_console.hh
Simple merge

diff --cc dev/disk_image.cc
Simple merge

diff --cc dev/ethertap.cc
Simple merge