Merge branches 'fsldma' and 'intel-mid' into dmaengine
commit0a4bbddde29c038f2c51a7abb03d6d07e679d8af
authorDan Williams <dan.j.williams@intel.com>
Wed, 8 Dec 2010 01:10:52 +0000 (7 17:10 -0800)
committerDan Williams <dan.j.williams@intel.com>
Wed, 8 Dec 2010 01:10:52 +0000 (7 17:10 -0800)
tree4257a25f3802a2879d9bcfc5e1a5e1e38e59d948
parentc989a7fc139ec8975fdc230e2de42f3c4555880e
parente2c8e425baa01a4c8e6ae1b90194ed3d3cde0c66
parent0be035f3485379d812d617ee7eaa255cde97dbfa
Merge branches 'fsldma' and 'intel-mid' into dmaengine
drivers/dma/intel_mid_dma.c