diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 17:33:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 17:33:16 -0700 |
| commit | 2c15bd00a5d6b2b64e006e91e2196f0c6a764cb6 (patch) | |
| tree | 2bfc3434e4c35d4eb91e5c3c02714c1fd2b83afb /fs/hostfs | |
| parent | 5fe3a5ae5c09d53b2b3c7a971e1d87ab3a747055 (diff) | |
| parent | 269cddd44e3588d1c50a7ec055b78de4d6c72cb6 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: Fix dlm lock status block comment in dlm.h
dlm: Don't send callback to node making lock request when "try 1cb" fails
Diffstat (limited to 'fs/hostfs')
0 files changed, 0 insertions, 0 deletions