aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-26 14:59:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-26 14:59:01 -0700
commitf761237eee55222fdb509c79e784a67ab3d72cbd (patch)
treea07de02671fe0967a3b23f4f9fecf1a70555fb14 /include/linux
parentMerge tag 'pm+acpi-for-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff)
parentdmaengine: sirf: fix a typo in moving running dma_desc to active queue (diff)
downloadlinux-dev-f761237eee55222fdb509c79e784a67ab3d72cbd.tar.xz
linux-dev-f761237eee55222fdb509c79e784a67ab3d72cbd.zip
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul: "Three fixes for slave dmanegine. Two are for typo omissions in sifr dmaengine driver and the last one is for the imx driver fixing a missing unlock" * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: sirf: fix a typo in moving running dma_desc to active queue dmaengine: sirf: fix a typo in dma_prep_interleaved dmaengine: imx-dma: fix missing unlock on error in imxdma_xfer_desc()
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions