From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jul 2012 17:58:45 +0000 (-0700)
Subject: Merge tag 'nfs-for-3.5-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: v3.5-rc7~12
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=4264e6a263fc7166a5aa5234819b94f6fc9a2cd2;p=karo-tx-linux.git

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
---

4264e6a263fc7166a5aa5234819b94f6fc9a2cd2