summaryrefslogtreecommitdiff
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-12-03 12:12:29 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-03 12:12:29 -0800
commitfe4bfb30fe5788100a70c0ed96ddd8c6186eb9c4 (patch)
tree054d3a37dd62db5f362947c306c12fc3a223571f /arch/x86/boot
parent367576b813ed66a000e66ec18f7082bbc84c05d7 (diff)
parente3e9887ee9de36d8e2bef972ad74a42abd7a44c4 (diff)
Merge branch 'sh/ehci' of master.kernel.org:/pub/scm/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.
Diffstat (limited to 'arch/x86/boot')
0 files changed, 0 insertions, 0 deletions