| commit | 2b014fcc7d99d31c3693a7e50d7dcb8b4ddc9cee | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 16 11:13:16 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 16 11:13:16 2012 -0700 |
| tree | bfe1fbe922fd456796ed0bde08a4dd3497411db1 | |
| parent | d3b8e0dc828f8ec9cc895bb46e8c51b2763e9d2c [diff] | |
| parent | ffc493062ce9987156945aa21a677d83a179fc0a [diff] |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma Pull two slave-dmaengine fixes from Vinod Koul: "One fixes the correct use of clock API in imx driver and the other enables clock for tegra driver, which is used for other tegra driver conversion to dmanegine in -next." * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dma: tegra: enable/disable dma clock dma: imx-dma: Fix kernel crash due to missing clock conversion