Merge branch 'dma40' into dmaengine
authorDan Williams <dan.j.williams@intel.com>
Tue, 19 Oct 2010 22:34:26 +0000 (15:34 -0700)
committerDan Williams <dan.j.williams@intel.com>
Tue, 19 Oct 2010 22:34:26 +0000 (15:34 -0700)

Trivial merge