]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
Merge branch 'libxfs-4.2-rc1-update' into for-next
authorDave Chinner <david@fromorbit.com>
Fri, 31 Jul 2015 01:13:16 +0000 (11:13 +1000)
committerDave Chinner <david@fromorbit.com>
Fri, 31 Jul 2015 01:13:16 +0000 (11:13 +1000)
1  2 
libxfs/libxfs_priv.h
mkfs/xfs_mkfs.c
repair/xfs_repair.c

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