summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-01 17:17:32 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-01 17:17:32 -0500
commit22fed39775c6f06e275075e1570e1cebb12593e0 (patch)
treed4390cd5c2badd7f468367d695f7a0bc71204b78 /include/net
parent4fff5056600300402472dcc99cd814bfa012d8ee (diff)
parent878dfd3210e0bfc047995022de3091724ea9a5f6 (diff)
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
Diffstat (limited to 'include/net')
0 files changed, 0 insertions, 0 deletions