1. 13 Apr, 2006 37 commits
  2. 12 Apr, 2006 3 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband · 907d91d7
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
        IB/mthca: Fix max_srq_sge returned by ib_query_device for Tavor devices
        IB/cache: Use correct pointer to calculate size
        IPoIB: Use spin_lock_irq() instead of spin_lock_irqsave()
        IPoIB: Close race in ipoib_flush_paths()
        IB/mthca: Disable tuning PCI read burst size
        IPoIB: Make send and receive queue sizes tunable
        IPoIB: Wait for join to finish before freeing mcast struct
        IB: simplify static rate encoding
        IPoIB: Consolidate private neighbour data handling
        IB/srp: Fix memory leak in options parsing
        IB/mthca: Always build debugging code unless CONFIG_EMBEDDED=y
        IPoIB: Always build debugging code unless CONFIG_EMBEDDED=y
        IB/mad: fix oops in cancel_mads
      907d91d7
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 646e120f
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        [PATCH] sata_mv: properly print HC registers
      646e120f
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 2e9f0e18
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
        [PATCH] Use pci_set_consistent_dma_mask in ixgb driver
        [PATCH] sky2: bad memory reference on dual port cards
        [PATCH] mv643xx_eth: Fix tx_timeout to only conditionally wake tx queue
        [PATCH] mv643xx_eth: Always free completed tx descs on tx interrupt
        [PATCH] net drivers: fix section attributes for gcc
        [PATCH] remove drivers/net/hydra.h
        [PATCH] drivers/net/via-rhine.c: make a function static
        [netdrvr b44] trim trailing whitespace
        [PATCH] b44: increase version to 1.00
        [PATCH] b44: disable default tx pause
        [PATCH] via-rhine: execute bounce buffers code on Rhine-I only
        [PATCH] network: axnet_cs.c: add missing 'PRIV' in ei_rx_overrun
        [PATCH] dlink pci cards using wrong driver
      2e9f0e18