diff --git a/[refs] b/[refs]
index f0a5c2bb5aa6..6de454bca76d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: add6ff1aa35495f259056954202494f89f11cc98
+refs/heads/master: 8921d4cab903a0578663d8c924d9054e96c2a0fa
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
index fec7065e75e6..2e48979baa4e 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
@@ -634,8 +634,9 @@ int iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans,
 	case IWL_AGG_ON:
 		break;
 	default:
-		IWL_WARN(trans, "Stopping AGG while state not ON"
-				"or starting\n");
+		IWL_WARN(trans, "Stopping AGG while state not ON "
+			 "or starting for %d on %d (%d)\n", sta_id, tid,
+			 trans->shrd->tid_data[sta_id][tid].agg.state);
 		spin_unlock_irqrestore(&trans->shrd->sta_lock, flags);
 		return 0;
 	}