diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-12-07 17:10:52 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-12-07 17:10:52 -0800 |
| commit | 0a4bbddde29c038f2c51a7abb03d6d07e679d8af (patch) | |
| tree | 4257a25f3802a2879d9bcfc5e1a5e1e38e59d948 /drivers/dma/intel_mid_dma.c | |
| parent | c989a7fc139ec8975fdc230e2de42f3c4555880e (diff) | |
| parent | e2c8e425baa01a4c8e6ae1b90194ed3d3cde0c66 (diff) | |
| parent | 0be035f3485379d812d617ee7eaa255cde97dbfa (diff) | |
| download | linux-0a4bbddde29c038f2c51a7abb03d6d07e679d8af.tar.gz linux-0a4bbddde29c038f2c51a7abb03d6d07e679d8af.tar.bz2 linux-0a4bbddde29c038f2c51a7abb03d6d07e679d8af.zip | |
Merge branches 'fsldma' and 'intel-mid' into dmaengine