Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Fri, 13 Aug 2010 13:16:30 +0000 (06:16 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 13 Aug 2010 13:16:30 +0000 (06:16 -0700)
commit961aafc044b934ac0e5d1ffe51fc5f33813b052b
treef03913ff8fd0d917b033935fcfb5d5c72de01f2b
parentaa8c6e9c959eab4d516bc07593bea20ade9ad80c
parent73d9a51835f7f9b725b4bec851dac9d6482438e7
Merge with head.
src/cpu/simple/timing.cc