summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorMartin Brandenburg <martin@omnibond.com>2016-09-28 14:47:29 -0400
committerMartin Brandenburg <martin@omnibond.com>2016-09-28 14:47:29 -0400
commitf808e138c0abd99bfce90ec8d4ef6406c2af714a (patch)
treebe66f4beb9de1b2fecbf1e59950fe714184c8ecb /security
parenta21aae3bb15a1d08040bdcf5a73504c0da9f5080 (diff)
parent0c95ad76361f1d75a1ffdf82deafbcec44d19c42 (diff)
downloadlinux-f808e138c0abd99bfce90ec8d4ef6406c2af714a.tar.bz2
Merge branch 'features' into for-next
Pull in an OrangeFS branch containing improvements which the userspace component and the kernel to negotiate mutually supported features.
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions