From: Chris Mason <chris.mason@oracle.com>
Date: Mon, 16 Jan 2012 20:26:17 +0000 (-0500)
Subject: Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration
X-Git-Tag: v3.3-rc1~26^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d756bd2d9339447c29bde950910586df8f8941ec;p=pandora-kernel.git

Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration

Conflicts:
	fs/btrfs/volumes.c

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

d756bd2d9339447c29bde950910586df8f8941ec
Reading git-diff-tree failed