From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 9 Apr 2015 02:03:24 +0000 (+1000)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: KARO-TXA5-2015-06-26~111
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eada1e3176aa515a1b649c5cb8bddbf40c822736;p=karo-tx-linux.git

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

eada1e3176aa515a1b649c5cb8bddbf40c822736