| commit | d6c0cb379c5198487e4ac124728cbb2346d63b1f | [log] [tgz] |
|---|---|---|
| author | Chris Mason <chris.mason@oracle.com> | Mon May 23 14:37:47 2011 -0400 |
| committer | Chris Mason <chris.mason@oracle.com> | Mon May 23 14:37:47 2011 -0400 |
| tree | 167a97ac58c7a2fbf7c4e94b6abbfe1e03af014a | |
| parent | 8e531cdfeb75269c6c5aae33651cca39707848da [diff] | |
| parent | 1f78160ce1b1b8e657e2248118c4d91f881763f0 [diff] |
Merge branch 'cleanups_and_fixes' into inode_numbers Conflicts: fs/btrfs/tree-log.c fs/btrfs/volumes.c Signed-off-by: Chris Mason <chris.mason@oracle.com>