summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-26 18:42:05 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-26 18:42:05 (GMT)
commita90e8a75fbf9e7fe2d88da6a5cf38be07fd81c35 (patch)
tree0c5388fdefd00f2f7e381e4f8bd7707e6baeb374 /drivers
parentcc597bc3d31468596af6b8ad2b1d1b593e308957 (diff)
parent20d5a39929232a715f29e6cb7e3f0d0c790f41eb (diff)
downloadlinux-fsl-qoriq-a90e8a75fbf9e7fe2d88da6a5cf38be07fd81c35.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: initialize file_lock struct in GETLK before copying conflicting lock dlm: fix plock notify callback to lockd
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions