From: Chris Mason <chris.mason@oracle.com>
Date: Thu, 29 Mar 2012 00:31:37 +0000 (-0400)
Subject: Merge branch 'error-handling' into for-linus
X-Git-Tag: v3.4-rc1~22^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d4284bd6e8d7dd1d5521a6747bdb6dc1caf0225;p=pandora-kernel.git

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>
---

1d4284bd6e8d7dd1d5521a6747bdb6dc1caf0225
Reading git-diff-tree failed