Merge zizzer.eecs.umich.edu:/bk/newmem

into  iceaxe.:/Volumes/work/m5/incoming

--HG--
extra : convert_revision : dad5311afaaf40c1378017514c8b3f73852f13f5

src/python/m5/objects/BaseCPU.py

@@ -41,7 +41,8 @@ class BaseCPU(SimObject):
         "terminate when all threads have reached this load count")
     max_loads_any_thread = Param.Counter(0,
         "terminate when any thread reaches this load count")
-    progress_interval = Param.Tick(0, "interval to print out the progress message")
+    progress_interval = Param.Tick(0,
+        "interval to print out the progress message")
 
     defer_registration = Param.Bool(False,
         "defer registration with system (for sampling)")