From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Dec 2011 00:38:57 +0000 (+1100)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: next-20111207~67
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bd3ddf3cdd5f6c12c673bf3a6560952d2c53379b;p=karo-tx-linux.git

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

bd3ddf3cdd5f6c12c673bf3a6560952d2c53379b