Merge branch 'cleanups-post-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.1
Signed-off-by: NChris Mason <clm@fb.com>

Conflicts:
	fs/btrfs/disk-io.c