| commit | 1d4284bd6e8d7dd1d5521a6747bdb6dc1caf0225 | [log] [tgz] |
|---|---|---|
| author | Chris Mason <chris.mason@oracle.com> | Wed Mar 28 20:31:37 2012 -0400 |
| committer | Chris Mason <chris.mason@oracle.com> | Wed Mar 28 20:31:37 2012 -0400 |
| tree | a7dde6312ec24eb6368cad7a3efedbf368a5a70c | |
| parent | b5d67f64f9bc656970dacba245410f0faedad18e [diff] | |
| parent | 65139ed99234d8505948cdb7a835452eb5c191f9 [diff] |
Merge branch 'error-handling' into for-linus Conflicts: fs/btrfs/ctree.c fs/btrfs/disk-io.c fs/btrfs/extent-tree.c fs/btrfs/extent_io.c fs/btrfs/extent_io.h fs/btrfs/inode.c fs/btrfs/scrub.c Signed-off-by: Chris Mason <chris.mason@oracle.com>