]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
Merge branch 'libxfs-4.15-sync' into for-next
authorEric Sandeen <sandeen@redhat.com>
Wed, 3 Jan 2018 20:09:36 +0000 (14:09 -0600)
committerEric Sandeen <sandeen@redhat.com>
Wed, 3 Jan 2018 20:09:36 +0000 (14:09 -0600)
1  2 
libxfs/util.c

diff --cc libxfs/util.c
Simple merge