]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'md-raid6-accel' into ioat3.2
authorDan Williams <dan.j.williams@intel.com>
Wed, 9 Sep 2009 00:42:29 +0000 (17:42 -0700)
committerDan Williams <dan.j.williams@intel.com>
Wed, 9 Sep 2009 00:42:29 +0000 (17:42 -0700)
commitf9dd2134374c8de6b911e2b8652c6c9622eaa658
treec1b8f8d622941606b9e7247ab31d811ba4295011
parent4b652f0db3be891c7b76b109c3b55003b920fc96
parent07a3b417dc3d00802bd7b4874c3e811f0b015a7d
Merge branch 'md-raid6-accel' into ioat3.2

Conflicts:
include/linux/dmaengine.h
arch/arm/mach-iop13xx/setup.c
arch/arm/plat-iop/adma.c
drivers/dma/dmaengine.c
drivers/dma/dmatest.c
drivers/md/raid5.c
include/linux/dmaengine.h