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

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

067d35817038da4a5d5bb6204626affc0b727f6e