Merge branch 'nfs-rdma'
authorTrond Myklebust <trond.myklebust@primarydata.com>
Sun, 24 Jul 2016 21:09:02 +0000 (17:09 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Sun, 24 Jul 2016 21:09:02 +0000 (17:09 -0400)
commit1592c4d62a89bbca895c568d65ce290dfbc36ecc
tree6b979bc02ded2ea7e644c34e6939ffbbb7ee001d
parent668f455dac57050e33a43ff5fe006f6cd947fc65
parentf0445670bd81cae9f46399d98fef5cd1622d9776
Merge branch 'nfs-rdma'
include/linux/sunrpc/auth.h
net/sunrpc/auth_gss/auth_gss.c