diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-08 12:29:52 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-08 12:29:52 -0800 |
commit | 165e4694dade7224f23785f9c3a89f3e9c3a9c14 (patch) | |
tree | 42162f0d45164e73c52a2db52b9157e2b7c0e454 /drivers/net/smc-ultra.c | |
parent | d238998fbfa49f30b02f0a5de5294ca53c58348c (diff) | |
parent | ad696989b4a2fce8494964814376aef41da3ff55 (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/srp: Release transport before removing host
IB/mlx4: Fix value of pkey_index in QP1 completions
MAINTAINERS: Update Sean Hefty's email address
Diffstat (limited to 'drivers/net/smc-ultra.c')
0 files changed, 0 insertions, 0 deletions