summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-01-07 21:47:05 +0100
committerDan Williams <dan.j.williams@intel.com>2011-01-07 21:47:05 +0100
commitbc0fa81473c077bf4403e3b7b3397326204b65cd (patch)
tree43e8c8792f787d4b7d23aecd4cc0efccd5ffb248 /drivers/dma
parentMerge branches 'fsldma' and 'intel-mid' into dmaengine (diff)
parentARM: PL08x: prevent dma_set_runtime_config() reconfiguring memcpy channels (diff)
parentdmaengine: dma40: Add support to split up large elements (diff)
downloadlinux-bc0fa81473c077bf4403e3b7b3397326204b65cd.tar.xz
linux-bc0fa81473c077bf4403e3b7b3397326204b65cd.zip
Merge branches 'amba' and 'dma40' into dmaengine