From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 7 Oct 2012 23:28:14 +0000 (+1100)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: next-20121008~64
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=501f4d0f33b90497ebd971316a9db625c9030ee7;p=karo-tx-linux.git

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

501f4d0f33b90497ebd971316a9db625c9030ee7