1. 06 Dec, 2006 38 commits
  2. 05 Dec, 2006 2 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · bf83c2a3
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
        [PATCH] pcmcia: at91_cf update
        [PATCH] pcmcia: fix m32r_cfc.c compilation
        [PATCH] pcmcia: ds.c debug enhancements
        [PATCH] pcmcia: at91_cf update
        [PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation
        [PATCH] pcmcia: remove prod_id indirection
        [PATCH] pcmcia: remove manf_id and card_id indirection
        [PATCH] pcmcia: IDs for Elan serial PCMCIA devcies
        [PATCH] pcmcia: allow for four multifunction subdevices
        [PATCH] pcmcia: handle __copy_from_user() return value in ioctl
        [PATCH] pcmcia: multifunction card handling fixes
        [PATCH] pcmcia: allow shared IRQs on pd6729 sockets
        [PATCH] pcmcia: start over after CIS override
        [PATCH] cm4000_cs: fix return value check
        [PATCH] pcmcia: yet another IDE ID
        [PATCH] pcmcia: Add an id to ide-cs.c
      bf83c2a3
    • Salyzyn, Mark's avatar
      [SCSI] aic79xx: Add ASC-29320LPE ids to driver · d32adcb8
      Salyzyn, Mark authored
      Simple patch to add the new PCIe version of the 29320 card.
      
      Signed-off: Mark Salyzyn <Mark_Salyzyn@adaptec.com>
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
      d32adcb8