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)
1  2 
src/cpu/simple/timing.cc

Simple merge