From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Apr 2013 23:53:15 +0000 (+1100)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: next-20130404~91
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7549133d43ce8fab7c0fffb6b0517b6f6746144d;p=karo-tx-linux.git

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

7549133d43ce8fab7c0fffb6b0517b6f6746144d