Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Jul 2010 02:02:21 +0000 (19:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Jul 2010 02:02:21 +0000 (19:02 -0700)
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  NFS: Ensure that writepage respects the nonblock flag
  NFS: kswapd must not block in nfs_release_page
  nfs: include space for the NUL in root path


Trivial merge