From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Apr 2010 01:34:56 +0000 (-0700)
Subject: Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v2.6.34-rc4~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fedfb947b2235c1085df97cf52f688b808c3a515;p=pandora-kernel.git

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
---

fedfb947b2235c1085df97cf52f688b808c3a515