From: Chris Mason <chris.mason@oracle.com>
Date: Mon, 16 Jan 2012 20:27:58 +0000 (-0500)
Subject: Merge branch 'integrity-check-patch-v2' of git://btrfs.giantdisaster.de/git/btrfs... 
X-Git-Tag: v3.3-rc1~26^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c126dea771be1b3c370c0ffc4a09e6a82d492a49;p=pandora-kernel.git

Merge branch 'integrity-check-patch-v2' of git://btrfs.giantdisaster.de/git/btrfs into integration

Conflicts:
	fs/btrfs/ctree.h
	fs/btrfs/super.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
---

c126dea771be1b3c370c0ffc4a09e6a82d492a49
Reading git-diff-tree failed