Merge branch 'coh' into dmaengine
authorDan Williams <dan.j.williams@intel.com>
Thu, 4 Mar 2010 04:22:21 +0000 (21:22 -0700)
committerDan Williams <dan.j.williams@intel.com>
Thu, 4 Mar 2010 04:22:21 +0000 (21:22 -0700)
commitdd58ffcf5a5352fc10820c8ffbcd5fed416a2c3a
treef36172b40f9f3fc2c646f70da40e01705399b6b8
parentaa4d72ae946a4fa40486b871717778734184fa29
parent56a5d3cf21c71963c8fc506e9b9d3f71641d9c71
Merge branch 'coh' into dmaengine
drivers/dma/dmatest.c
drivers/dma/ioat/dma_v2.c
drivers/dma/ipu/ipu_idmac.c