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