Merge branch 'dmaengine-fixes' into dmaengine
authorDan Williams <dan.j.williams@intel.com>
Fri, 11 Mar 2011 22:45:54 +0000 (14:45 -0800)
committerDan Williams <dan.j.williams@intel.com>
Fri, 11 Mar 2011 22:45:54 +0000 (14:45 -0800)

Trivial merge