diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 17:31:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 17:31:41 -0700 |
| commit | a15306365a16380f3bafee9e181ba01231d4acd7 (patch) | |
| tree | c5eb3756235ac7fe4ce540730b8d7480318c5953 /net/mac80211/main.c | |
| parent | bb896afe2089575ca1bb1fbf3f07b934e1ba999b (diff) | |
| parent | c5057ddccbcb4bf363af628d7963a7475f4114a7 (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:
mlx4_core: Support creation of FMRs with pages smaller than 4K
IB/ehca: Fix function return types
RDMA/cxgb3: Bump up the MPA connection setup timeout.
RDMA/cxgb3: Silently ignore close reply after abort.
RDMA/cxgb3: QP flush fixes
IB/ipoib: Fix transmit queue stalling forever
IB/mlx4: Fix off-by-one errors in calls to mlx4_ib_free_cq_buf()
Diffstat (limited to 'net/mac80211/main.c')
0 files changed, 0 insertions, 0 deletions