summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-25 00:04:00 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-25 00:04:00 +0200
commitdf3256f9ab7ae2127144de5ba2abca332278a42d (patch)
treec2cbdca425b745894a23f8cf7d7c91effcd7478c /tools
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff)
parentdlm: make plock operation killable (diff)
downloadlinux-df3256f9ab7ae2127144de5ba2abca332278a42d.tar.xz
linux-df3256f9ab7ae2127144de5ba2abca332278a42d.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: 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 'tools')
0 files changed, 0 insertions, 0 deletions