Merge zizzer:/n/wexford/x/gblack/m5/newmem_bus

into  zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest

--HG--
extra : convert_revision : 70187b8f04d0f8424512f64bdade05bf1aca85a3

src/mem/bus.cc

@@ -206,8 +206,8 @@ void
 Bus::recvRetry(int id)
 {
     DPRINTF(Bus, "Received a retry\n");
-    // If there's anything waiting...
-    if (retryList.size()) {
+    // If there's anything waiting, and the bus isn't busy...
+    if (retryList.size() && curTick >= tickNextIdle) {
         //retryingPort = retryList.front();
         inRetry = true;
         DPRINTF(Bus, "Sending a retry\n");