Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This is an archived project. Repository and other project resources are read-only.

Commit d756bd2d authored Jan 16, 2012 by Chris Mason

Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration



Conflicts:
	fs/btrfs/volumes.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>

parents 27263e28 b367e47f

Hide whitespace changes

Inline Side-by-side

Please register or to comment