From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Oct 2011 01:34:53 +0000 (+1100)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: next-20111012~80
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bd1cbb1cc9d28983acdbc57932caa008cf5a42c8;p=karo-tx-linux.git

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

bd1cbb1cc9d28983acdbc57932caa008cf5a42c8