tree 5eb0ffcd0eace60c7e206df6f33f9841b452f2b3
parent 44fa2b4bee5b07d506a7b002b4e2eb73654db7e0
parent bade732a2848e640482c1e99629a90e085d574dd
author Linus Torvalds <torvalds@linux-foundation.org> 1271122496 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1271122496 -0700

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