From: Chris Mason <chris.mason@oracle.com>
Date: Sun, 6 Nov 2011 08:05:08 +0000 (-0500)
Subject: Merge branch 'for-chris' of git://github.com/sensille/linux into integration
X-Git-Tag: v3.2-rc1~21^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=531f4b1ae5e0fc8c9b3f03838218e5ea178f80d3;p=pandora-kernel.git

Merge branch 'for-chris' of git://github.com/sensille/linux into integration

Conflicts:
	fs/btrfs/ctree.h

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

531f4b1ae5e0fc8c9b3f03838218e5ea178f80d3
Reading git-diff-tree failed