From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 Aug 2013 00:47:34 +0000 (+1000)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: next-20130805~83
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b1416f51399c4dd131fdf2bebf699bc3b2685936;p=karo-tx-linux.git

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

b1416f51399c4dd131fdf2bebf699bc3b2685936