From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 30 Nov 2011 01:20:02 +0000 (+1100)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: next-20111130~67
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f1b28776117dcbaab6ccfd8cb0539f759320e97c;p=karo-tx-linux.git

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

f1b28776117dcbaab6ccfd8cb0539f759320e97c