Merge branch 'bug-fixes' of git://repo.or.cz/linux-btrfs-devel into btrfs-38
authorChris Mason <chris.mason@oracle.com>
Fri, 28 Jan 2011 21:24:59 +0000 (16:24 -0500)
committerChris Mason <chris.mason@oracle.com>
Fri, 28 Jan 2011 21:24:59 +0000 (16:24 -0500)

Trivial merge