summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-12 18:34:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-12 18:34:56 -0700
commitfedfb947b2235c1085df97cf52f688b808c3a515 (patch)
tree5eb0ffcd0eace60c7e206df6f33f9841b452f2b3 /arch
parent44fa2b4bee5b07d506a7b002b4e2eb73654db7e0 (diff)
parentbade732a2848e640482c1e99629a90e085d574dd (diff)
downloadlinux-fedfb947b2235c1085df97cf52f688b808c3a515.tar.bz2
Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.34' of git://linux-nfs.org/~bfields/linux: svcrdma: RDMA support not yet compatible with RPC6
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions