From: Linus Torvalds 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: firefly_0821_release~9833^2~2367 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fedfb947b2235c1085df97cf52f688b808c3a515;p=firefly-linux-kernel-4.4.55.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