Merge branch 2.6.39-rc7 into usb-linus

This was needed to resolve a conflict in:
	drivers/usb/host/isp1760-hcd.c

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

diff --cc drivers/usb/host/ehci-omap.c
Simple merge

diff --cc drivers/usb/host/xhci-hub.c
index e3ddc6a95afe2544fa4d8b848354e1f14bd013a3,73f75d26436c48635bca66c68a777891287b36c9..a5696373601895f0c19909e1f7e3c75437c5b0d1
--- 1/drivers/usb/host/xhci-hub.c
--- 2/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@@ -844,9 -777,9 +844,9 @@@ int xhci_bus_suspend(struct usb_hcd *hc
                if (t1 != t2)
                        xhci_writel(xhci, t2, port_array[port_index]);
  
-               if (DEV_HIGHSPEED(t1)) {
+               if (hcd->speed != HCD_USB3) {
                        /* enable remote wake up for USB 2.0 */
 -                      u32 __iomem *addr;
 +                      __le32 __iomem *addr;
                        u32 tmp;
  
                        /* Add one to the port status register address to get
@@@ -940,9 -888,9 +955,9 @@@ int xhci_bus_resume(struct usb_hcd *hcd
                } else
                        xhci_writel(xhci, temp, port_array[port_index]);
  
-               if (DEV_HIGHSPEED(temp)) {
+               if (hcd->speed != HCD_USB3) {
                        /* disable remote wake up for USB 2.0 */
 -                      u32 __iomem *addr;
 +                      __le32 __iomem *addr;
                        u32 tmp;
  
                        /* Add one to the port status register address to get

diff --cc drivers/usb/musb/musb_gadget.c
Simple merge

diff --cc drivers/usb/musb/omap2430.c
Simple merge