Merge vm1.(none):/home/stever/bk/newmem-head

into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : 6f462916cb0eb309b6799e94fbf07629abb50eba

1 files changed, 6 insertions, 5 deletions

diff --git a/src/mem/packet.cc b/src/mem/packet.cc
index 8c69def37..a257e16ab 100644
--- a/src/mem/packet.cc
+++ b/src/mem/packet.cc
@@ -193,11 +193,12 @@ fixPacket(PacketPtr func, PacketPtr timing)
             func->flags |= SATISFIED;
             return false;
         } else {
-            // In this case the timing packet only partially satisfies the
-            // requset, so we would need more information to make this work.
-            // Like bytes valid in the packet or something, so the request could
-            // continue and get this bit of possibly newer data along with the
-            // older data not written to yet.
+            // In this case the timing packet only partially satisfies
+            // the request, so we would need more information to make
+            // this work.  Like bytes valid in the packet or
+            // something, so the request could continue and get this
+            // bit of possibly newer data along with the older data
+            // not written to yet.
             panic("Timing packet only partially satisfies the functional"
                     "request. Now what?");
         }