Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration