From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mon, 9 Aug 2010 09:36:44 +0000 (+0100)
Subject: Merge branch 'async' of macbook:git/btrfs-unstable
X-Git-Tag: v2.6.36-rc1~280^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2144381da478cc4aa3a29ee29b0c5e6ddaaced14;p=pandora-kernel.git

Merge branch 'async' of macbook:git/btrfs-unstable

Conflicts:
	drivers/md/Makefile
	lib/raid6/unroll.pl
---

2144381da478cc4aa3a29ee29b0c5e6ddaaced14
Reading git-diff-tree failed