]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branch 'features' into for-next
authorMartin Brandenburg <martin@omnibond.com>
Wed, 28 Sep 2016 18:47:29 +0000 (14:47 -0400)
committerMartin Brandenburg <martin@omnibond.com>
Wed, 28 Sep 2016 18:47:29 +0000 (14:47 -0400)
Pull in an OrangeFS branch containing improvements which the userspace
component and the kernel to negotiate mutually supported features.


Trivial merge