| commit | 4beb2584be3cf1d4fc7a222b0f747735da8e3c91 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Jun 22 11:10:34 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Jun 22 11:10:34 2007 -0700 |
| tree | bd12e3af59bcf46102c53b27acc1911707174f5c | |
| parent | e2f90a9141d9e1a4cd0e79716919a5fa39684ae9 [diff] | |
| parent | c8681f14013d3ad2fc4fb4e30cfd4ea548f7a249 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/mlx4: Correct max_srq_wr returned from mlx4_ib_query_device() IPoIB/cm: Remove dead definition of struct ipoib_cm_id IPoIB/cm: Fix interoperability when MTU doesn't match IPoIB/cm: Initialize RX before moving QP to RTR IB/umem: Fix possible hang on process exit