From: J. Bruce Fields Date: Tue, 11 Jan 2011 15:28:36 +0000 (-0500) Subject: Merge commit 'v2.6.37' into for-2.6.38-incoming X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a2c50f69168deec3f7e47644eb4ef4f8a3ee6910;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.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