Merge 3.1-rc4 into usb-next

This was done to resolve a conflict in this file:
	drivers/usb/host/xhci-ring.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
index 9e77f1c8bdbd..64bcf66d3040 100644
--- a/drivers/usb/host/ehci-s5p.c
+++ b/drivers/usb/host/ehci-s5p.c
@@ -270,7 +270,7 @@ static int s5p_ehci_resume(struct device *dev)
         /* here we "know" root ports should always stay powered */
         ehci_port_power(ehci, 1);
 
-        hcd->state = HC_STATE_SUSPENDED;
+        ehci->rh_state = EHCI_RH_SUSPENDED;
 
         return 0;
 }