Merge branch 'dma40' into dmaengine
authorDan Williams <dan.j.williams@intel.com>
Mon, 14 Feb 2011 11:36:44 +0000 (03:36 -0800)
committerDan Williams <dan.j.williams@intel.com>
Mon, 14 Feb 2011 11:36:44 +0000 (03:36 -0800)

Trivial merge