]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa4d72a 56a5d3c)
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)
1  2 
drivers/dma/dmatest.c patch | diff1 | diff2 | blob | history
drivers/dma/ioat/dma_v2.c patch | diff1 | diff2 | blob | history
drivers/dma/ipu/ipu_idmac.c patch | diff1 | diff2 | blob | history

diff --cc drivers/dma/dmatest.c
Simple merge
diff --cc drivers/dma/ioat/dma_v2.c
Simple merge
diff --cc drivers/dma/ipu/ipu_idmac.c
Simple merge
Clone of davem's net-next-2.6 tree