From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 24 Aug 2012 00:45:18 +0000 (+1000)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: next-20120824~87
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=48d291af61982bb1f6fd9f0c87df164352ecbed0;p=karo-tx-linux.git

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

48d291af61982bb1f6fd9f0c87df164352ecbed0