Merge tag 'nfs-for-3.5-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jul 2012 17:58:45 +0000 (10:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jul 2012 17:58:45 +0000 (10:58 -0700)
commit4264e6a263fc7166a5aa5234819b94f6fc9a2cd2
tree15418e913161c719b738b6defa53cac8ebeb2dfd
parent8d657eb3b43861064d36241e88d9d61c709f33f0
parentf1daf666dd7d097653bd38320248c68084b1febf
Merge tag 'nfs-for-3.5-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client bugfixes from Trond Myklebust:
 - Fix an NFSv4 mount regression
 - Fix O_DIRECT list manipulation snafus

* tag 'nfs-for-3.5-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv4: Fix an NFSv4 mount regression
  NFS: Fix list manipulation snafus in fs/nfs/direct.c