summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-21 10:36:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-21 10:36:06 -0700
commite08f6d4131ab964420f0bcabecc68d75fb49df79 (patch)
treee1d2116899c4e0240d0c5ae4507f67ab801c91ee /fs
parent890879cfa08f5ceaa09810611f46e890f7d57ff6 (diff)
parentc7d74b090913102e7917dd02bb574ef060e1e930 (diff)
downloadlinux-3.10-e08f6d4131ab964420f0bcabecc68d75fb49df79.tar.gz
linux-3.10-e08f6d4131ab964420f0bcabecc68d75fb49df79.tar.bz2
linux-3.10-e08f6d4131ab964420f0bcabecc68d75fb49df79.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: IB/qib: Ensure that LOS and DFE are being turned off RDMA/cxgb4: Couple of abort fixes RDMA/cxgb4: Don't truncate MR lengths RDMA/cxgb4: Don't exceed hw IQ depth limit for user CQs
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions