tree 3f5d705161f24c6a9dc36c1947ce7f81e53db41b
parent af36d15f58a3560617f1497ae011c3192049e40e
parent 62e4a76987eab2b7fa952546614bc83e5bfc9d3e
author Linus Torvalds <torvalds@linux-foundation.org> 1321980855 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1321980855 -0800

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

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFS: Revert pnfs ugliness from the generic NFS read code path
  SUNRPC: destroy freshly allocated transport in case of sockaddr init error
  NFS: Fix a regression in the referral code
  nfs: move nfs_file_operations declaration to bottom of file.c (try #2)
  nfs: when attempting to open a directory, fall back on normal lookup (try #5)