From: Nikolaus Rath Date: Sat, 15 Oct 2016 23:24:02 +0000 (-0700) Subject: Merge branch 'fixup-lock-options' X-Git-Tag: fuse-3.0.0rc1~45 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=587df370419e641ed47489f08069ad5f4ca4fe5f;p=qemu-gpiodev%2Flibfuse.git Merge branch 'fixup-lock-options' --- 587df370419e641ed47489f08069ad5f4ca4fe5f