diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-01-07 12:47:05 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-01-07 12:47:05 -0800 |
| commit | bc0fa81473c077bf4403e3b7b3397326204b65cd (patch) | |
| tree | 43e8c8792f787d4b7d23aecd4cc0efccd5ffb248 /block | |
| parent | 0a4bbddde29c038f2c51a7abb03d6d07e679d8af (diff) | |
| parent | b7f758659265c173380b792862aaad1c23c0e004 (diff) | |
| parent | d49278e3351b34870cbffffc5067348a318e7b06 (diff) | |
Merge branches 'amba' and 'dma40' into dmaengine