tree 5454fe74c5edd4c8cf3658f1dff10005ff34d113
parent 099dc4fb62653f6019d78db55fba7a18ef02d65b
parent 3211e4eb5834924dd5beac8956c0bc0bfb755c37
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1202434142 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1202434142 -0800

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