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:
Chris Mason <clm@fb.com>
Conflicts:
fs/btrfs/extent_io.c
Please register or sign in to comment