From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Sep 2012 01:13:32 +0000 (+1000)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: next-20120912~97
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=31ce0ed551dfcf10916be2006585299ccbb02d5b;p=karo-tx-linux.git

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

31ce0ed551dfcf10916be2006585299ccbb02d5b