Merge branch 'sh/ehci' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2...
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 3 Dec 2010 20:12:29 +0000 (12:12 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 3 Dec 2010 20:12:29 +0000 (12:12 -0800)
commitfe4bfb30fe5788100a70c0ed96ddd8c6186eb9c4
tree054d3a37dd62db5f362947c306c12fc3a223571f
parent367576b813ed66a000e66ec18f7082bbc84c05d7
parente3e9887ee9de36d8e2bef972ad74a42abd7a44c4
Merge branch 'sh/ehci' of /linux/kernel/git/lethal/sh-2.6 into work

* 'sh/ehci' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Convert to USB_ARCH_HAS_OHCI/EHCI selects.
  usb: ehci-sh: Add missing ehci helpers.
  usb: ehci-sh: Fix up fault in shutdown path.
  sh: Add EHCI support for SH7786.
  usb: ehci-hcd: Add support for SuperH EHCI.
  usb: ohci-sh: Set IRQ as shared.
drivers/usb/Kconfig
drivers/usb/host/ehci-hcd.c