tree f96aeb682bcc4fdcf75d080f260c809b9fbc4a1a
parent 27263e28321db438bc43dc0c0be432ce91526224
parent b367e47fb3a70f5d24ebd6faf7d42436d485fb2d
author Chris Mason <chris.mason@oracle.com> 1326745577 -0500
committer Chris Mason <chris.mason@oracle.com> 1326745577 -0500

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>