Merge branch 'dev/pending-changes' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

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

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

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

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