Merge branch 'dma40' into dmaengine
authorDan Williams <dan.j.williams@intel.com>
Tue, 19 Oct 2010 22:34:26 +0000 (15:34 -0700)
committerDan Williams <dan.j.williams@intel.com>
Tue, 19 Oct 2010 22:34:26 +0000 (15:34 -0700)
commit42e55736f7efd7658f8826a5f441c3ccb962db74
tree150a54e47af512c72a1ec105d31fcdfa9957a673
parent9cb047d4d19fc15791a64d900d483405eae6200d
parent5c3720935813c45c2893fdb53eb6f73f1aee93c7
Merge branch 'dma40' into dmaengine
drivers/dma/ste_dma40.c