projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fff505 878dfd3)
Merge tag 'for-linus' of git://github.com/martinbrandenburg/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Apr 2016 22:17:32 +0000 (17:17 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Apr 2016 22:17:32 +0000 (17:17 -0500)
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


Trivial merge
Motorola kernel-slsi