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)
commit60f1df5dc6ecd07befc332ae30109fb86505634c
tree77cb78a15424ff493f4d171d66752009b4483420
parent2335d338a20a6f5ac70ae4338733c8ff5933f978
parent341b9419a8c0a4cdb75773c576870f1eb655516d
Merge branch 'dmaengine-shawn' into dmaengine
drivers/dma/imx-sdma.c