From: Dave Chinner <david@fromorbit.com>
Date: Mon, 3 Aug 2015 23:57:50 +0000 (+1000)
Subject: Merge branch 'progs-misc-fixes-2' into for-next
X-Git-Tag: v4.2.0-rc1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92592be58e2fac449b603cb11986f6f754e2c66f;p=thirdparty%2Fxfsprogs-dev.git

Merge branch 'progs-misc-fixes-2' into for-next

Conflicts:
	copy/xfs_copy.c
---

92592be58e2fac449b603cb11986f6f754e2c66f