From: J. Bruce Fields <bfields@redhat.com>
Date: Tue, 11 Jan 2011 15:28:36 +0000 (-0500)
Subject: Merge commit 'v2.6.37' into for-2.6.38-incoming
X-Git-Tag: firefly_0821_release~7613^2~2697^2~20
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a2c50f69168deec3f7e47644eb4ef4f8a3ee6910;p=firefly-linux-kernel-4.4.55.git

Merge commit 'v2.6.37' into for-2.6.38-incoming

I made a slight mess of Documentation/filesystems/Locking; resolve
conflicts with upstream before fixing it up.
---

a2c50f69168deec3f7e47644eb4ef4f8a3ee6910