• Linus Torvalds's avatar
    Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · 86dca4f8
    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (33 commits)
      [PATCH] pcmcia: declare pccard_iodyn_ops (fix m8xx_pcmcia.c compilation error)
      [PATCH] pcmcia: fix pcmcia_device_remove oops
      [PATCH] pcmcia: Add support for Possio GCC AKA PCMCIA Siemens MC45
      [PATCH] pcmcia: pseudo device handling update
      [PATCH] pcmcia: convert DEV_OK to pcmcia_dev_present
      [PATCH] pcmcia: use bitfield instead of p_state and state
      [PATCH] pcmcia: remove unused p_dev->state flags
      [PATCH] pcmcia: make pcmcia_release_{io,irq} static
      [PATCH] pcmcia: add return value to _config() functions
      [PATCH] pcmcia: remove dev_link_t and client_handle_t indirection
      [PATCH] pcmcia: embed dev_link_t into struct pcmcia_device
      [PATCH] pcmcia: rename pcmcia_device.state
      [PATCH] pcmcia: remove unneeded Vcc pseudo setting
      [PATCH] pcmcia: remove export of pcmcia_release_configuration
      [PATCH] pcmcia: default suspend and resume handling
      [PATCH] pcmcia: convert remaining users of pcmcia_release_io and _irq
      [PATCH] pcmcia: add pcmcia_disable_device
      [PATCH] serial_cs: add Merlin U630 IDs
      [PATCH] pcmcia: AT91RM9200 Compact Flash driver
      [PATCH] pcmcia: socket.functions starts with 1
      ...
    86dca4f8
xirc2ps_cs.c 57.9 KB