From: Dan Williams <dan.j.williams@intel.com>
Date: Wed, 9 Sep 2009 00:42:29 +0000 (-0700)
Subject: Merge branch 'md-raid6-accel' into ioat3.2
X-Git-Tag: v2.6.32-rc1~60^2^2~33
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9dd2134374c8de6b911e2b8652c6c9622eaa658;p=pandora-kernel.git

Merge branch 'md-raid6-accel' into ioat3.2

Conflicts:
	include/linux/dmaengine.h
---

f9dd2134374c8de6b911e2b8652c6c9622eaa658
Reading git-diff-tree failed