From: Chris Mason <chris.mason@oracle.com>
Date: Thu, 31 May 2012 20:50:28 +0000 (-0400)
Subject: Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-linus
X-Git-Tag: v3.5-rc1~17^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e20932a23578bb1ec59107843574e259b96193f;p=pandora-kernel.git

Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-linus

Conflicts:
	fs/btrfs/ulist.h

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

1e20932a23578bb1ec59107843574e259b96193f
Reading git-diff-tree failed