1. 31 Jul, 2007 38 commits
  2. 30 Jul, 2007 2 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · cbdd3deb
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
        Fix a potential NULL pointer dereference in mace_interrupt() in drivers/net/pcmcia/nmclan_cs.c
        PATCH kernel 2.6.22] PCMCIA-NETDEV : modify smc91c92_cs.c to become SMP safe
        S2io: Increment received packet count correctly
        S2io: Fix crash when resetting adapter
        S2io: Mask spurious interrupts
        S2IO: Implementing review comments from old patches
        S2IO: Checking for the return value of pci map function
        S2IO: Removing MSI support from driver
        S2IO: Removing 3 buffer mode support from the driver
        netxen: drop redudant spinlock
        netxen: Fix interrupt handling for multiport adapters
        netxen: re-init station address after h/w init
        tulip: Remove tulip maintainer
        forcedeth: mac address correct
        gfar: Fix modpost warning
        lib8390: comment on locking by Alan Cox
        Fix a potential NULL pointer dereference in write_bulk_callback() in drivers/net/usb/pegasus.c
      cbdd3deb
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 4dcf39c6
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/ipath: Workaround problem of errormask register being overwritten
        IB/ipath: Fix some issues with buffer cancel and sendctrl register update
        IB/ipath: Use faster put_tid_2 routine after initialization
        IB/ipath: Remove unsafe fastrcvint code from interrupt handler
        IB/ehca: Move extern declarations from .c files to .h files
        IB/mlx4: Whitespace fix
        IB/ehca: Fix include order to better match kernel style
        mlx4_core: Remove kfree() in mlx4_mr_alloc() error flow
        RDMA/amso1100: Initialize the wait_queue_head_t in the c2_qp structure
      4dcf39c6