From: Chris Mason <chris.mason@oracle.com>
Date: Sun, 6 Nov 2011 08:07:10 +0000 (-0500)
Subject: Merge git://git.jan-o-sch.net/btrfs-unstable into integration
X-Git-Tag: v3.2-rc1~21^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=806468f8bf76a3cb2b626dd282946a6c9c0a50f0;p=pandora-kernel.git

Merge git://git.jan-o-sch.net/btrfs-unstable into integration

Conflicts:
	fs/btrfs/Makefile
	fs/btrfs/extent_io.c
	fs/btrfs/extent_io.h
	fs/btrfs/scrub.c

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

806468f8bf76a3cb2b626dd282946a6c9c0a50f0
Reading git-diff-tree failed