diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-12 16:07:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-12 16:07:54 -0700 |
| commit | 907d91d708d9999bec0185d630062576ac4181a7 (patch) | |
| tree | faf16e6a0ceaa70f55cbb1a8abc7814f5e106e4e /block | |
| parent | 646e120ffe885d70c75460f515d56a5c0d72002e (diff) | |
| parent | 59fef3b1e96217c6e736372ff8cc95cbcca1b6aa (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* '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
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions