From 98a473b5690ea199b7ac2947ada45d815cd15806 Mon Sep 17 00:00:00 2001
From: Andiry Xu <andiry.xu@amd.com>
Date: Fri, 23 Sep 2011 14:19:55 -0700
Subject: [PATCH] --- yaml --- r: 265028 b: refs/heads/master c:
 cd68176abf1098af83c968da274fe908eb7a8a72 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/usb/host/xhci.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 390ef9a27ea5..8013a02e23c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e393a834b41001174a8fb3ae3bc23a749467760
+refs/heads/master: cd68176abf1098af83c968da274fe908eb7a8a72
diff --git a/trunk/drivers/usb/host/xhci.c b/trunk/drivers/usb/host/xhci.c
index 4648cc0c5721..7bf86774b1aa 100644
--- a/trunk/drivers/usb/host/xhci.c
+++ b/trunk/drivers/usb/host/xhci.c
@@ -3476,7 +3476,7 @@ int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev)
 	 * command on a timeout.
 	 */
 	if (timeleft <= 0) {
-		xhci_warn(xhci, "%s while waiting for a slot\n",
+		xhci_warn(xhci, "%s while waiting for address device command\n",
 				timeleft == 0 ? "Timeout" : "Signal");
 		/* FIXME cancel the address device command */
 		return -ETIME;