| commit | a2c50f69168deec3f7e47644eb4ef4f8a3ee6910 | [log] [tgz] |
|---|---|---|
| author | J. Bruce Fields <bfields@redhat.com> | Tue Jan 11 10:28:36 2011 -0500 |
| committer | J. Bruce Fields <bfields@redhat.com> | Tue Jan 11 15:02:19 2011 -0500 |
| tree | 987197653dcdbf3d33a7c678dbef9cc884f36afa | |
| parent | 8c3df3e58cde676de4df9363c00f37dbfce08e5c [diff] | |
| parent | 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 [diff] |
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.