leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4c1ac1b491
linux/drivers/usb/host
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
ehci-au1xxx.c USB: Properly unregister reboot notifier in case of failure in ehci hcd 2006-09-27 11:58:54 -07:00
ehci-dbg.c USB: revert EHCI VIA workaround patch 2006-10-17 13:57:18 -07:00
ehci-fsl.c USB: Properly unregister reboot notifier in case of failure in ehci hcd 2006-09-27 11:58:54 -07:00
ehci-fsl.h [PATCH] USB: EHCI for Freescale 83xx 2006-03-20 14:49:55 -08:00
ehci-hcd.c EHCI: Fix root-hub and port suspend/resume problems 2006-12-01 14:25:52 -08:00
ehci-hub.c EHCI: Fix root-hub and port suspend/resume problems 2006-12-01 14:25:52 -08:00
ehci-mem.c USB: EHCI whitespace fixes (cosmetic) 2006-09-27 11:58:56 -07:00
ehci-pci.c EHCI: Fix root-hub and port suspend/resume problems 2006-12-01 14:25:52 -08:00
ehci-q.c USB: revert EHCI VIA workaround patch 2006-10-17 13:57:18 -07:00
ehci-sched.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
ehci.h EHCI: Fix root-hub and port suspend/resume problems 2006-12-01 14:25:52 -08:00
hc_crisv10.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
hc_crisv10.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
isp116x-hcd.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
isp116x.h USB: Dealias -110 code (more complete) 2006-09-27 11:59:00 -07:00
Kconfig Fix misc Kconfig typos 2006-11-30 05:22:59 +01:00
Makefile USB: u132-hcd: host controller driver for ELAN U132 adapter 2006-09-27 11:58:59 -07:00
ohci-at91.c USB: ohci-at91, two one-liners 2006-09-27 11:58:57 -07:00
ohci-au1xxx.c USB: Properly unregister reboot notifier in case of failure in ehci hcd 2006-09-27 11:58:54 -07:00
ohci-dbg.c USB: fix __must_check warnings in drivers/usb/host/ 2006-09-27 11:58:58 -07:00
ohci-ep93xx.c USB: Properly unregister reboot notifier in case of failure in ehci hcd 2006-09-27 11:58:54 -07:00
ohci-hcd.c USB: OHCI: disable RHSC inside interrupt handler 2006-12-01 14:23:27 -08:00
ohci-hub.c OHCI: make autostop conditional on CONFIG_PM 2006-12-01 14:25:52 -08:00
ohci-lh7a404.c USB: Properly unregister reboot notifier in case of failure in ehci hcd 2006-09-27 11:58:54 -07:00
ohci-mem.c USB: Properly unregister reboot notifier in case of failure in ehci hcd 2006-09-27 11:58:54 -07:00
ohci-omap.c USB: Properly unregister reboot notifier in case of failure in ehci hcd 2006-09-27 11:58:54 -07:00
ohci-pci.c ohci: Use ref-counting hotplug safe interfaces 2006-09-28 15:36:43 -07:00
ohci-pnx4008.c USB: ohci-pnx4008 build fixes 2006-10-17 14:46:30 -07:00
ohci-ppc-soc.c USB: Properly unregister reboot notifier in case of failure in ehci hcd 2006-09-27 11:58:54 -07:00
ohci-pxa27x.c USB: Properly unregister reboot notifier in case of failure in ehci hcd 2006-09-27 11:58:54 -07:00
ohci-q.c [PATCH] ohci: don't play with IRQ regs 2006-10-06 08:53:40 -07:00
ohci-s3c2410.c USB: Properly unregister reboot notifier in case of failure in ehci hcd 2006-09-27 11:58:54 -07:00
ohci-sa1111.c USB: OHCI avoids root hub timer polling 2006-09-27 11:58:48 -07:00
ohci.h OHCI: add auto-stop support 2006-09-28 15:36:46 -07:00
pci-quirks.c [PATCH] USB: Kill compiler warning in quirk_usb_handoff_ohci 2006-07-12 16:03:22 -07:00
pci-quirks.h [PATCH] USB: pci-quirks.c: proper prototypes 2006-04-14 11:12:20 -07:00
sl811_cs.c [PATCH] USB: move hardware-specific <linux/usb_*.h> to <linux/usb/*.h> 2006-06-21 15:04:18 -07:00
sl811-hcd.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
sl811.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
u132-hcd.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
uhci-debug.c USB: Make file operations structs in drivers/usb const. 2006-09-27 11:58:52 -07:00
uhci-hcd.c UHCI: workaround for Asus motherboard 2006-10-17 14:46:31 -07:00
uhci-hcd.h [PATCH] UHCI: Improve FSBR-off timing 2006-06-21 15:04:16 -07:00
uhci-hub.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
uhci-q.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00