diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 04:02:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 04:02:09 +0100 |
| commit | 7d8a804c594b61a05c698126165b5dc417d94a0f (patch) | |
| tree | 5718ed900d1a8aa7d85eaa02dc27fda8230a688e /fs/ocfs2 | |
| parent | Merge branch 'i2c-next' of git://aeryn.fluff.org.uk/bjdooks/linux (diff) | |
| parent | dlm: fs/dlm/ast.c: fix warning (diff) | |
| download | linux-7d8a804c594b61a05c698126165b5dc417d94a0f.tar.xz linux-7d8a804c594b61a05c698126165b5dc417d94a0f.zip | |
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: fs/dlm/ast.c: fix warning
dlm: add new debugfs entry
dlm: add time stamp of blocking callback
dlm: change lock time stamping
dlm: improve how bast mode handling
dlm: remove extra blocking callback check
dlm: replace schedule with cond_resched
dlm: remove kmap/kunmap
dlm: trivial annotation of be16 value
dlm: fix up memory allocation flags
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions