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)
Conflicts:
include/linux/dmaengine.h


Trivial merge