7dbfce08e5c
parent 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
author J. Bruce Fields <bfields@redhat.com> 1294759716 -0500
committer J. Bruce Fields <bfields@redhat.com> 1294776139 -0500

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.
ˆ‡ˆ¸Ÿ