From: J. Bruce Fields <bfields@redhat.com>
Date: Fri, 30 Aug 2013 20:42:49 +0000 (-0400)
Subject: Merge tag 'v3.11-rc5' into for-3.12 branch
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b8297cec2da30d3a5869597dbd7c8280d46a7dba;p=linux-beck.git

Merge tag 'v3.11-rc5' into for-3.12 branch

For testing purposes I want some nfs and nfsd bugfixes (specifically,
58cd57bfd9db3bc213bf9d6a10920f82095f0114 and previous nfsd patches, and
Trond's 4f3cc4809a98a165a9708b72b47de71643797bbd).
---

b8297cec2da30d3a5869597dbd7c8280d46a7dba