tree 43e8c8792f787d4b7d23aecd4cc0efccd5ffb248
parent 0a4bbddde29c038f2c51a7abb03d6d07e679d8af
parent b7f758659265c173380b792862aaad1c23c0e004
parent d49278e3351b34870cbffffc5067348a318e7b06
author Dan Williams <dan.j.williams@intel.com> 1294433225 -0800
committer Dan Williams <dan.j.williams@intel.com> 1294433225 -0800

Merge branches 'amba' and 'dma40' into dmaengine