From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Mar 2015 17:41:15 +0000 (-0700)
Subject: Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: omap-for-v4.1/fixes-rc1~294
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d122f7430ed4c4298e33e0d70dc4065679720a2;p=pandora-kernel.git

Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux

Pull nfsd bufix from Bruce Fields:
 "This is a fix for a crash easily triggered by 4.1 activity to a server
  built with CONFIG_NFSD_PNFS.

  There are some more bugfixes queued up that I intend to pass along
  next week, but this is the most critical"

* 'for-4.0' of git://linux-nfs.org/~bfields/linux:
  Subject: nfsd: don't recursively call nfsd4_cb_layout_fail
---

0d122f7430ed4c4298e33e0d70dc4065679720a2
Reading git-diff-tree failed