From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 8 Feb 2008 01:29:02 +0000 (-0800)
Subject: Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
X-Git-Tag: v2.6.25-rc1~286
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6a852e93705121e2b90bd41ad50e85a508699aa;p=linux-2.6

Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

* git://git.linux-nfs.org/pub/linux/nfs-2.6:
  SUNRPC xptrdma: simplify build configuration
  NFS: Fix a potential file corruption issue when writing
---

a6a852e93705121e2b90bd41ad50e85a508699aa