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

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

7e5286802bf15aa3d1695b2d3d05ea66a82f00c0