]> www.infradead.org Git - nvme.git/commitdiff
projects / nvme.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 367576b e3e9887)
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)
* '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.

1  2 
drivers/usb/Kconfig patch | diff1 | diff2 | blob | history
drivers/usb/host/ehci-hcd.c patch | diff1 | diff2 | blob | history

diff --cc drivers/usb/Kconfig
Simple merge
diff --cc drivers/usb/host/ehci-hcd.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.