From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Nov 2012 00:17:29 +0000 (+1100)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: next-20121113~98
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d7569a06951c66dd174e7df1ad51b7534124a32c;p=karo-tx-linux.git

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

d7569a06951c66dd174e7df1ad51b7534124a32c