Merge Gabe's changes from head.

--HG--
extra : convert_revision : d00b7b09c7f19bc0e37b385ef7c124f69c0e917f

diff --cc src/cpu/base.cc
Simple merge

diff --cc src/cpu/o3/fetch_impl.hh
Simple merge

diff --cc src/cpu/simple/atomic.cc
Simple merge

diff --cc src/cpu/simple/timing.cc
Simple merge