diff options
author | 2010-03-13 14:38:31 -0800 | |
---|---|---|
committer | 2010-03-13 14:38:31 -0800 | |
commit | 122ce878dc189860a380539bde19498bf93443a7 (patch) | |
tree | 8414acd7b686ad4af6b16d0952823f07a12f2522 /kernel/sysctl.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 (diff) | |
parent | Merge branches 'cxgb3', 'ipoib', 'misc' and 'nes' into for-next (diff) | |
download | linux-dev-122ce878dc189860a380539bde19498bf93443a7.tar.xz linux-dev-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 'kernel/sysctl.c')
0 files changed, 0 insertions, 0 deletions