David Howells 4796b71fbb Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: drivers/pcmcia/ds.c Fix up merge failures with Linus's head and fix new compile failures. Signed-Off-By: David Howells <dhowells@redhat.com>		2006-12-06 15:01:18 +00:00
..
ehci-au1xxx.c
ehci-dbg.c	USB: revert EHCI VIA workaround patch	2006-10-17 13:57:18 -07:00
ehci-fsl.c
ehci-fsl.h
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
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
ehci.h	EHCI: Fix root-hub and port suspend/resume problems	2006-12-01 14:25:52 -08:00
hc_crisv10.c
hc_crisv10.h
isp116x-hcd.c
isp116x.h
Kconfig	Fix misc Kconfig typos	2006-11-30 05:22:59 +01:00
Makefile
ohci-at91.c
ohci-au1xxx.c
ohci-dbg.c
ohci-ep93xx.c
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
ohci-mem.c
ohci-omap.c
ohci-pci.c
ohci-pnx4008.c	USB: ohci-pnx4008 build fixes	2006-10-17 14:46:30 -07:00
ohci-ppc-soc.c
ohci-pxa27x.c
ohci-q.c	[PATCH] ohci: don't play with IRQ regs	2006-10-06 08:53:40 -07:00
ohci-s3c2410.c
ohci-sa1111.c
ohci.h
pci-quirks.c
pci-quirks.h
sl811_cs.c	[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation	2006-12-04 20:12:02 -05:00
sl811-hcd.c
sl811.h
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
uhci-hcd.c	UHCI: workaround for Asus motherboard	2006-10-17 14:46:31 -07:00
uhci-hcd.h
uhci-hub.c
uhci-q.c