tree 0f7510f8f3364833024cb92267b2d39183fe803d
parent a7ddbf891b8236b51fb3c9574555eb7d7d13aca6
parent 2df54806389205d76bc3d1ce8a10cc14889ddec9
author Linus Torvalds <torvalds@linux-foundation.org> 1253744561 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253744561 -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: Propagate 'fsc' mount option through automounts
  sunrpc/rpc_pipe: fix kernel-doc notation
  sunrpc: xdr_xcode_hyper helpers cannot presume 64-bit alignment
  NFS: Add nfs_alloc_parsed_mount_data
  NFS/RPC: fix problems with reestablish_timeout and related code.
  NFS: Get rid of the NFS_MOUNT_VER3 and NFS_MOUNT_TCP flags