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

Signed-off-by: Chris Mason <clm@fb.com>
Conflicts:
	fs/btrfs/extent_io.c

diff --cc fs/btrfs/ctree.c
Simple merge

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/extent-tree.c
Simple merge

diff --cc fs/btrfs/extent_io.c
Simple merge

diff --cc fs/btrfs/extent_io.h
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/btrfs/relocation.c
Simple merge

diff --cc fs/btrfs/send.c
Simple merge

diff --cc fs/btrfs/transaction.c
Simple merge