Merge branch 'dmaengine-sdma' into dmaengine
authorSascha Hauer <s.hauer@pengutronix.de>
Mon, 31 Jan 2011 11:42:48 +0000 (12:42 +0100)
committerSascha Hauer <s.hauer@pengutronix.de>
Mon, 31 Jan 2011 11:42:48 +0000 (12:42 +0100)

Trivial merge