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