tree 25a8ca59a3743459bbd48674731becea89a16318
parent f80a0ca6ad8f2800453e819dafa09a0ed9e56850
parent 9699eda6bc1f708a28acb716e1477aa351362fe2
author Linus Torvalds <torvalds@linux-foundation.org> 1272561824 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1272561824 -0700

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  nfs: fix memory leak in nfs_get_sb with CONFIG_NFS_V4
  nfs: fix some issues in nfs41_proc_reclaim_complete()
  NFS: Ensure that nfs_wb_page() waits for Pg_writeback to clear
  NFS: Fix an unstable write data integrity race
  nfs: testing for null instead of ERR_PTR()
  NFS: rsize and wsize settings ignored on v4 mounts
  NFSv4: Don't attempt an atomic open if the file is a mountpoint
  SUNRPC: Fix a bug in rpcauth_prune_expired