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

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

78b2f2e596d64ce630903dc31130867cf6b8f60d