]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2335d33 341b941)
Merge branch 'dmaengine-shawn' into dmaengine
authorSascha Hauer <s.hauer@pengutronix.de>
Mon, 31 Jan 2011 11:42:51 +0000 (12:42 +0100)
committerSascha Hauer <s.hauer@pengutronix.de>
Mon, 31 Jan 2011 11:42:51 +0000 (12:42 +0100)
1  2 
drivers/dma/imx-sdma.c patch | diff1 | diff2 | blob | history

diff --cc drivers/dma/imx-sdma.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.