Merge branch 'cov-fixes-v1-integration-20130201' of http://git.zabbo.net/cgit/btrfs...

diff --cc cmds-filesystem.c
Simple merge

diff --cc ctree.h
Simple merge

diff --cc disk-io.c
Simple merge

diff --cc disk-io.h
Simple merge

diff --cc extent_io.c
Simple merge

diff --cc find-root.c
Simple merge

diff --cc kerncompat.h
Simple merge

diff --cc mkfs.c
Simple merge

diff --cc restore.c
Simple merge

diff --cc volumes.c
Simple merge