Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 8 Feb 2008 01:29:02 +0000 (17:29 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 8 Feb 2008 01:29:02 +0000 (17:29 -0800)
commita6a852e93705121e2b90bd41ad50e85a508699aa
tree5454fe74c5edd4c8cf3658f1dff10005ff34d113
parent099dc4fb62653f6019d78db55fba7a18ef02d65b
parent3211e4eb5834924dd5beac8956c0bc0bfb755c37
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