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

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

7d0d5941b6242004dc0db9f4d314e1ee7950e80c