| commit | d756bd2d9339447c29bde950910586df8f8941ec | [log] [tgz] |
|---|---|---|
| author | Chris Mason <chris.mason@oracle.com> | Mon Jan 16 15:26:17 2012 -0500 |
| committer | Chris Mason <chris.mason@oracle.com> | Mon Jan 16 15:26:17 2012 -0500 |
| tree | f96aeb682bcc4fdcf75d080f260c809b9fbc4a1a | |
| parent | 27263e28321db438bc43dc0c0be432ce91526224 [diff] | |
| parent | b367e47fb3a70f5d24ebd6faf7d42436d485fb2d [diff] |
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>