Merge branch 'for-chris' of git://github.com/idryomov/btrfs-progs
authorChris Mason <chris.mason@oracle.com>
Thu, 9 Feb 2012 02:29:56 +0000 (21:29 -0500)
committerChris Mason <chris.mason@oracle.com>
Thu, 9 Feb 2012 02:29:56 +0000 (21:29 -0500)

Trivial merge