Merge branches 'amba' and 'dma40' into dmaengine
authorDan Williams <dan.j.williams@intel.com>
Fri, 7 Jan 2011 20:47:05 +0000 (12:47 -0800)
committerDan Williams <dan.j.williams@intel.com>
Fri, 7 Jan 2011 20:47:05 +0000 (12:47 -0800)

Trivial merge