original_kernel/drivers/usb/host
Linus Torvalds 2be4ff2f08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
  pcmcia: ioctl-internal definitions
  pcmcia: cistpl header cleanup
  pcmcia: remove unused argument to pcmcia_parse_tuple()
  pcmcia: card services header cleanup
  pcmcia: device_id header cleanup
  pcmcia: encapsulate ioaddr_t
  pcmcia: cleanup device driver header file
  pcmcia: cleanup socket services header file
  pcmcia: merge ds_internal.h into cs_internal.h
  pcmcia: cleanup cs_internal.h
  pcmcia: cs_internal.h is internal
  pcmcia: use dev_printk for cs_error()
  pcmcia: remove CS_ error codes alltogether
  pcmcia: deprecate CS_BAD_TUPLE
  pcmcia: deprecate CS_BAD_ARGS
  pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
  pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
  pcmcia: deprecate CS_NO_MORE_ITEMS
  pcmcia: deprecate CS_IN_USE
  pcmcia: deprecate CS_CONFIGURATION_LOCKED
  ...

Fix trivial conflict in drivers/pcmcia/ds.c manually
2008-10-13 14:12:40 -07:00
..
Kconfig
Makefile
ehci-au1xxx.c
ehci-dbg.c
ehci-fsl.c
ehci-fsl.h
ehci-hcd.c
ehci-hub.c
ehci-ixp4xx.c ALSA: Correct Vladimir Barinov's e-mail address 2008-10-10 13:41:45 +02:00
ehci-mem.c
ehci-orion.c
ehci-pci.c
ehci-ppc-of.c
ehci-ppc-soc.c
ehci-ps3.c
ehci-q.c
ehci-sched.c
ehci.h
isp116x-hcd.c
isp116x.h
isp1760-hcd.c
isp1760-hcd.h
isp1760-if.c
ohci-at91.c
ohci-au1xxx.c
ohci-dbg.c
ohci-ep93xx.c
ohci-hcd.c
ohci-hub.c
ohci-lh7a404.c
ohci-mem.c
ohci-omap.c
ohci-pci.c
ohci-pnx4008.c
ohci-pnx8550.c
ohci-ppc-of.c
ohci-ppc-soc.c
ohci-ps3.c
ohci-pxa27x.c [ARM] ohci-pxa27x: use ioremap() and offset for register access 2008-10-07 19:12:58 +01:00
ohci-q.c
ohci-s3c2410.c
ohci-sa1111.c
ohci-sh.c
ohci-sm501.c
ohci-ssb.c
ohci.h
pci-quirks.c
pci-quirks.h
r8a66597-hcd.c
r8a66597.h
sl811-hcd.c
sl811.h
sl811_cs.c
u132-hcd.c
uhci-debug.c
uhci-hcd.c
uhci-hcd.h
uhci-hub.c
uhci-q.c