summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-09 17:58:52 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-09 17:58:52 +0200
commit26a94e81ded0fcdc0bf96b5fea7343311f1a220b (patch)
treed944d7cefc2416f3aae8c733b678c43ac0f6bd46 /fs
parentMerge branch 'fixes' of git://oss.oracle.com/git/tma/linux-2.6 (diff)
parentMerge branches 'cxgb3' and 'nes' into for-linus (diff)
downloadlinux-26a94e81ded0fcdc0bf96b5fea7343311f1a220b.tar.xz
linux-26a94e81ded0fcdc0bf96b5fea7343311f1a220b.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 hang with modified FIN handling on A0 cards RDMA/nes: Change state to closing after FIN RDMA/nes: Fix double CLOSE event indication crash RDMA/nes: Write correct register write to set TX pause param RDMA/cxgb3: Don't exceed the max HW CQ depth
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions