]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
Merge branch 'progs-misc-fixes-1' into for-next
authorDave Chinner <david@fromorbit.com>
Fri, 31 Jul 2015 01:10:39 +0000 (11:10 +1000)
committerDave Chinner <david@fromorbit.com>
Fri, 31 Jul 2015 01:10:39 +0000 (11:10 +1000)
1  2 
libxfs/Makefile
libxfs/libxfs_priv.h
mkfs/xfs_mkfs.c

diff --cc libxfs/Makefile
Simple merge
Simple merge
diff --cc mkfs/xfs_mkfs.c
Simple merge