From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 May 2014 00:30:59 +0000 (+1000)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: next-20140530~92
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3856f5352b4e280d12a3afe7cf57f258f698351c;p=karo-tx-linux.git

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

3856f5352b4e280d12a3afe7cf57f258f698351c