Merge branch 'readonly-snapshots' of git://repo.or.cz/linux-btrfs-devel into btrfs-38
authorChris Mason <chris.mason@oracle.com>
Sun, 16 Jan 2011 16:24:45 +0000 (11:24 -0500)
committerChris Mason <chris.mason@oracle.com>
Sun, 16 Jan 2011 16:24:45 +0000 (11:24 -0500)

Trivial merge