tree a7dde6312ec24eb6368cad7a3efedbf368a5a70c
parent b5d67f64f9bc656970dacba245410f0faedad18e
parent 65139ed99234d8505948cdb7a835452eb5c191f9
author Chris Mason <chris.mason@oracle.com> 1332981097 -0400
committer Chris Mason <chris.mason@oracle.com> 1332981097 -0400

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>