From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 9 Dec 2011 01:43:21 +0000 (+1100)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: next-20111209~71
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9c952bdb8296696cd40459ccd07a4c86d03895dc;p=karo-tx-linux.git

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

9c952bdb8296696cd40459ccd07a4c86d03895dc