Merge branch 'cleanup/divs' of git://git.kernel.org/pub/scm/linux/ker… · mariux64/linux@9b30563 · GitHub

Commit

Merge branch 'cleanup/divs' of git://git.kernel.org/pub/scm/linux/ker…

Browse files

…nel/git/kdave/linux into for-linus-4.1

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

Conflicts:
	fs/btrfs/volumes.c

Loading branch information

Chris Mason committed Mar 25, 2015

2 parents fc4c3c8 + 29cf342 commit 9b30563