summaryrefslogtreecommitdiff
path: root/fs/ocfs2/dlmglue.c
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@bootlin.com>2018-04-04 23:13:35 +0300
committerBoris Brezillon <boris.brezillon@bootlin.com>2018-04-04 23:13:35 +0300
commitfe5f31a8010a0cb13e72cfb72905fefa2a41730c (patch)
tree324d237e47092cc66b13c7421dbda6ea6961c6b4 /fs/ocfs2/dlmglue.c
parenta88b5f38338db9cf2b8868e3645c30da655ac139 (diff)
parent91ab883eb21325ad80f3473633f794c78ac87f51 (diff)
downloadlinux-fe5f31a8010a0cb13e72cfb72905fefa2a41730c.tar.xz
Merge tag 'v4.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mtd/next
Backmerge v4.16-rc2 into mtd/next to resolve a conflict between Linus' master branch and nand/for-4.17.
Diffstat (limited to 'fs/ocfs2/dlmglue.c')
0 files changed, 0 insertions, 0 deletions