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 /fs/btrfs/acl.c | |
| parent | Merge branches 'fsldma' and 'intel-mid' into dmaengine (diff) | |
| parent | ARM: PL08x: prevent dma_set_runtime_config() reconfiguring memcpy channels (diff) | |
| parent | dmaengine: dma40: Add support to split up large elements (diff) | |
| download | linux-dev-bc0fa81473c077bf4403e3b7b3397326204b65cd.tar.xz linux-dev-bc0fa81473c077bf4403e3b7b3397326204b65cd.zip | |
Merge branches 'amba' and 'dma40' into dmaengine