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)
commit2335d338a20a6f5ac70ae4338733c8ff5933f978
tree32d4d5270a761c72854258c9c3d1180de34ebb4b
parentf8a356ff96a9070156f863e4f7716e2a0eb8c995
parent23889c6352ab4a842a30221bb412ff49954b2fb3
Merge branch 'dmaengine-sdma' into dmaengine