Merge kroah.com:/home/greg/linux/BK/bleed-2.6

into kroah.com:/home/greg/linux/BK/usb-2.6

diff --cc drivers/usb/host/ehci-dbg.c
index e5019971fae0f961dc632518903f872fb6aa7a9e,143019c6a75c104d31cd184538e2b3c7e3806018..e354a830d8159ae0d24179afa4461e95ab69db08
--- 1/drivers/usb/host/ehci-dbg.c
--- 2/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@@ -623,9 -623,9 +623,9 @@@ show_registers (struct class_device *cl
  
        /* Capability Registers */
        i = HC_VERSION(readl (&ehci->caps->hc_capbase));
 -      temp = snprintf (next, size,
 +      temp = scnprintf (next, size,
                "PCI device %s\nEHCI %x.%02x, hcd state %d (driver " DRIVER_VERSION ")\n",
-               pci_name(hcd->pdev),
+               pci_name(to_pci_dev(hcd->self.controller)),
                i >> 8, i & 0x0ff, ehci->hcd.state);
        size -= temp;
        next += temp;