Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work into for-linus

Conflicts:
	fs/btrfs/transaction.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>