From: Dan Williams <dan.j.williams@intel.com>
Date: Wed, 9 Sep 2009 00:55:21 +0000 (-0700)
Subject: Merge branch 'dmaengine' into async-tx-next
X-Git-Tag: v2.6.32-rc1~60^2^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbb20089a3275a19e475dbc21320c3742e3ca423;p=pandora-kernel.git

Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c
---

bbb20089a3275a19e475dbc21320c3742e3ca423
Reading git-diff-tree failed