tree c1b8f8d622941606b9e7247ab31d811ba4295011
parent 4b652f0db3be891c7b76b109c3b55003b920fc96
parent 07a3b417dc3d00802bd7b4874c3e811f0b015a7d
author Dan Williams <dan.j.williams@intel.com> 1252456949 -0700
committer Dan Williams <dan.j.williams@intel.com> 1252456949 -0700

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

Conflicts:
	include/linux/dmaengine.h