diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 22:04:00 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 22:04:00 (GMT) |
| commit | df3256f9ab7ae2127144de5ba2abca332278a42d (patch) | |
| tree | c2cbdca425b745894a23f8cf7d7c91effcd7478c /fs/file_table.c | |
| parent | b0ca118dbacbc6c35e15f216e25e95cca7aedf5b (diff) | |
| parent | 901025d2f3194b4868980c8ba80df4cc0aa1282c (diff) | |
| download | linux-fsl-qoriq-df3256f9ab7ae2127144de5ba2abca332278a42d.tar.xz | |
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: make plock operation killable
dlm: remove shared message stub for recovery
dlm: delayed reply message warning
dlm: Remove superfluous call to recalc_sigpending()
Diffstat (limited to 'fs/file_table.c')
0 files changed, 0 insertions, 0 deletions