Merger

cpu/simple_cpu/simple_cpu.hh:
    Merge

--HG--
extra : convert_revision : 1b6003ac731051fefacb7d7a30c317553b4bf1bc

diff --cc cpu/base_cpu.cc
Simple merge

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

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