Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Apr 2010 01:34:56 +0000 (18:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Apr 2010 01:34:56 +0000 (18:34 -0700)
commitfedfb947b2235c1085df97cf52f688b808c3a515
tree5eb0ffcd0eace60c7e206df6f33f9841b452f2b3
parent44fa2b4bee5b07d506a7b002b4e2eb73654db7e0
parentbade732a2848e640482c1e99629a90e085d574dd
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
net/sunrpc/xprtrdma/svc_rdma_transport.c