diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-19 16:18:21 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-19 16:18:21 -0700 |
commit | 5a0cd4eb661fea095ff9962060c21c161a9ed43f (patch) | |
tree | 7e1e7a044fc9d04d2da246a58a52bd07c4e5fef0 /include/asm-x86/proto.h | |
parent | b4df9d88a62c6db4cee0d96507a27527bf205dde (diff) | |
parent | 7e2c23285454ecc8c8159b86d6343efe222ca3ae (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:
IPoIB: Fix deadlock on RTNL between bcast join comp and ipoib_stop()
RDMA/nes: Fix client side QP destroy
IB/mlx4: Fix up fast register page list format
mlx4_core: Set RAE and init mtt_sz field in FRMR MPT entries
Diffstat (limited to 'include/asm-x86/proto.h')
0 files changed, 0 insertions, 0 deletions