From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Apr 2016 22:17:32 +0000 (-0500)
Subject: Merge tag 'for-linus' of git://github.com/martinbrandenburg/linux
X-Git-Tag: v4.6-rc2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22fed39775c6f06e275075e1570e1cebb12593e0;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'for-linus' of git://github.com/martinbrandenburg/linux

Pull OrangeFS fixes from Martin Brandenburg:
 "Two bugfixes for OrangeFS.

  One is a reference counting bug and the other is a typo in client
  minimum version"

* tag 'for-linus' of git://github.com/martinbrandenburg/linux:
  orangefs: minimum userspace version is 2.9.3
  orangefs: don't put readdir slot twice
---

22fed39775c6f06e275075e1570e1cebb12593e0