From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 29 Nov 2011 00:33:41 +0000 (+1100)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: next-20111129~64
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6ec46a52747cfbc23bfa80862092c32afee310eb;p=karo-tx-linux.git

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

6ec46a52747cfbc23bfa80862092c32afee310eb