Merge branch 'imx' into dmaengine-fixes
authorDan Williams <dan.j.williams@intel.com>
Mon, 14 Feb 2011 10:40:46 +0000 (02:40 -0800)
committerDan Williams <dan.j.williams@intel.com>
Mon, 14 Feb 2011 10:40:46 +0000 (02:40 -0800)
commite19d1d4988f8020c25bf1758f9a898e1374cef35
tree5bd1ba3f13178becefad85b41a8bfe8c4652cee2
parenta646bd7f0824d3e0f02ff8d7410704f965de01bc
parent60f1df5dc6ecd07befc332ae30109fb86505634c
Merge branch 'imx' into dmaengine-fixes
drivers/dma/imx-sdma.c