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
This commit is contained in:
Linus Torvalds 2008-02-07 17:29:02 -08:00
commit a6a852e937
2 changed files with 19 additions and 8 deletions