From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Dec 2011 01:29:15 +0000 (+1100)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: next-20111213~72
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=200171a12115d44d61c6e665498577b8b9ef3b46;p=karo-tx-linux.git

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

200171a12115d44d61c6e665498577b8b9ef3b46