diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-19 11:52:30 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-19 11:52:30 -0700 |
commit | 52824b6b5fa0533e2b2adc9df396d0e9ff6fb02a (patch) | |
tree | 86b588fcd75715ed578f92c0abb3149d6cf617b5 /net/socket.c | |
parent | 949b211235cf301790ef4fb903af65d71be29b2a (diff) | |
parent | 415dcd95b25b59631656f559570d1a973bf691a9 (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: make a function static
IB/ipath: Fix whitespace
IB/ipath: Make more names static
IB/mad: Fix RMPP version check during agent registration
IB/srp: Remove request from list when SCSI abort succeeds
Diffstat (limited to 'net/socket.c')
0 files changed, 0 insertions, 0 deletions