diff options
author | 2007-06-22 11:10:34 -0700 | |
---|---|---|
committer | 2007-06-22 11:10:34 -0700 | |
commit | 4beb2584be3cf1d4fc7a222b0f747735da8e3c91 (patch) | |
tree | bd12e3af59bcf46102c53b27acc1911707174f5c /net/tipc/netlink.c | |
parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | IB/mlx4: Correct max_srq_wr returned from mlx4_ib_query_device() (diff) | |
download | linux-dev-4beb2584be3cf1d4fc7a222b0f747735da8e3c91.tar.xz linux-dev-4beb2584be3cf1d4fc7a222b0f747735da8e3c91.zip |
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
Diffstat (limited to 'net/tipc/netlink.c')
0 files changed, 0 insertions, 0 deletions