• Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · d9b2c4d0
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (50 commits)
      pcmcia: rework the irq_req_t typedef
      pcmcia: remove deprecated handle_to_dev() macro
      pcmcia: pcmcia_request_window() doesn't need a pointer to a pointer
      pcmcia: remove unused "window_t" typedef
      pcmcia: move some window-related code to pcmcia_ioctl.c
      pcmcia: Change window_handle_t logic to unsigned long
      pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page()
      pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()
      pcmcia: Pass struct pcmcia_device to pcmcia_release_window()
      drivers/pcmcia: remove unnecessary kzalloc
      pcmcia: correct handling for Zoomed Video registers in topic.h
      pcmcia: fix printk formats
      pcmcia: autoload module pcmcia
      pcmcia/staging: update comedi drivers
      PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket
      PCMCIA: ss: allow PCI IRQs > 255
      PCMCIA: soc_common: remove 'dev' member from soc_pcmcia_socket
      PCMCIA: soc_common: constify soc_pcmcia_socket ops member
      PCMCIA: sa1111: remove duplicated initializers
      PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data
      ...
    d9b2c4d0
ray_cs.c 89.1 KB