Merge commit 'v2.6.37' into for-2.6.38-incoming
authorJ. Bruce Fields <bfields@redhat.com>
Tue, 11 Jan 2011 15:28:36 +0000 (10:28 -0500)
committerJ. Bruce Fields <bfields@redhat.com>
Tue, 11 Jan 2011 20:02:19 +0000 (15:02 -0500)
commita2c50f69168deec3f7e47644eb4ef4f8a3ee6910
tree987197653dcdbf3d33a7c678dbef9cc884f36afa
parent8c3df3e58cde676de4df9363c00f37dbfce08e5c
parent3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
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.