Merge branch 'bug-fixes' of git://repo.or.cz/linux-btrfs-devel into btrfs-38

This commit is contained in:
Chris Mason 2011-01-28 16:24:59 -05:00
commit eab49bec41
6 changed files with 117 additions and 65 deletions