diff options
| author | Linus Torvalds <[email protected]> | 2010-03-13 22:38:31 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-03-13 22:38:31 +0000 |
| commit | 122ce878dc189860a380539bde19498bf93443a7 (patch) | |
| tree | 8414acd7b686ad4af6b16d0952823f07a12f2522 /net/lapb/lapb_in.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sam... (diff) | |
| parent | Merge branches 'cxgb3', 'ipoib', 'misc' and 'nes' into for-next (diff) | |
| download | kernel-122ce878dc189860a380539bde19498bf93443a7.tar.gz kernel-122ce878dc189860a380539bde19498bf93443a7.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:
RDMA/nes: Fix CX4 link problem in back-to-back configuration
RDMA/nes: Clear stall bit before destroying NIC QP
RDMA/nes: Set assume_aligned_header bit
RDMA/cxgb3: Wait at least one schedule cycle during device removal
IB/mad: Ignore iWARP devices on device removal
IPoIB: Include return code in trace message for ib_post_send() failures
IPoIB: Fix TX queue lockup with mixed UD/CM traffic
Diffstat (limited to 'net/lapb/lapb_in.c')
0 files changed, 0 insertions, 0 deletions