From: Greg Kroah-Hartman Date: Fri, 3 Dec 2010 20:12:29 +0000 (-0800) Subject: Merge branch 'sh/ehci' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2... X-Git-Tag: firefly_0821_release~7613^2~3111^2~11^2~30 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fe4bfb30fe5788100a70c0ed96ddd8c6186eb9c4;p=firefly-linux-kernel-4.4.55.git 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. --- fe4bfb30fe5788100a70c0ed96ddd8c6186eb9c4