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

Simple merge