Merge branch 'cleanup/divs' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.1

Signed-off-by: Chris Mason <[email protected]>

Conflicts:
	fs/btrfs/volumes.c

Author: masoncl