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)
commit26c79f6ba0ccdc4bbc8ef8721406d37e9178e30b
treec5bcbf8f605afdae1a89ea2617f29052ac8c6f18
parent65e5341b9a0c39767ae1fecc727d70eda0dd6d83
parent0caa102da82799efaba88e234484786a9591c797
Merge branch 'readonly-snapshots' of git://repo.or.cz/linux-btrfs-devel into btrfs-38