Skip to content
Commit bbf65cf0 authored by Chris Mason's avatar Chris Mason
Browse files

Merge branch 'cleanup/misc-for-3.18' of...

Merge branch 'cleanup/misc-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

 into for-linus

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

Conflicts:
	fs/btrfs/extent_io.c
parents bf8e8ca6 fccb84c9
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment