From: Chris Mason <chris.mason@oracle.com>
Date: Thu, 15 Dec 2011 18:43:49 +0000 (-0500)
Subject: Merge branch 'for-chris' of http://git.kernel.org/pub/scm/linux/kernel/git/josef... 
X-Git-Tag: v3.2-rc6~4^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=567a45e917343c952806bb9f5c19aab0139bd519;p=pandora-kernel.git

Merge branch 'for-chris' of git./linux/kernel/git/josef/btrfs-work into integration

Conflicts:
	fs/btrfs/inode.c

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

567a45e917343c952806bb9f5c19aab0139bd519
Reading git-diff-tree failed