From: Chris Mason <clm@fb.com>
Date: Wed, 25 Mar 2015 19:25:02 +0000 (-0700)
Subject: Merge branch 'cleanup/divs' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Tag: v4.1-rc1~5^2~59
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=9b305632cb220ffa495cbbefb313f3c34d4decc4

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

Signed-off-by: Chris Mason <clm@fb.com>

Conflicts:
	fs/btrfs/volumes.c
---

9b305632cb220ffa495cbbefb313f3c34d4decc4