summaryrefslogtreecommitdiff
path: root/drivers/dma/intel_mid_dma.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2010-12-07 17:10:52 -0800
committerDan Williams <dan.j.williams@intel.com>2010-12-07 17:10:52 -0800
commit0a4bbddde29c038f2c51a7abb03d6d07e679d8af (patch)
tree4257a25f3802a2879d9bcfc5e1a5e1e38e59d948 /drivers/dma/intel_mid_dma.c
parentc989a7fc139ec8975fdc230e2de42f3c4555880e (diff)
parente2c8e425baa01a4c8e6ae1b90194ed3d3cde0c66 (diff)
parent0be035f3485379d812d617ee7eaa255cde97dbfa (diff)
Merge branches 'fsldma' and 'intel-mid' into dmaengine