Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into integration

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/file.c
Simple merge

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

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

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

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

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

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