From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Nov 2015 00:07:28 +0000 (+1100)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: KARO-TXUL-2015-12-04~118
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=d6f5480a5549f1073d13e505319cb270a2c06719

Merge remote-tracking branch 'nfsd/nfsd-next'
---

d6f5480a5549f1073d13e505319cb270a2c06719