From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 14 Nov 2011 00:16:43 +0000 (+1100)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: next-20111114~52
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ce5d830d65b7b8d17effde94d364ea72313452b9;p=karo-tx-linux.git

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

ce5d830d65b7b8d17effde94d364ea72313452b9