summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/cluster
diff options
context:
space:
mode:
authorLinus Torvalds2016-01-20 19:15:21 +0100
committerLinus Torvalds2016-01-20 19:15:21 +0100
commit9fa686068a32ddf256df03982b3e3967c18654a8 (patch)
tree888adef0b50c93df4c40c4b5555a6c17460320c1 /fs/ocfs2/cluster
parentMerge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/k... (diff)
parentdmaengine: rcar-dmac: Document SoC specific bindings (diff)
downloadkernel-qcow2-linux-9fa686068a32ddf256df03982b3e3967c18654a8.tar.gz
kernel-qcow2-linux-9fa686068a32ddf256df03982b3e3967c18654a8.tar.xz
kernel-qcow2-linux-9fa686068a32ddf256df03982b3e3967c18654a8.zip
Merge tag 'dmaengine-fix-4.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul: "Here is my second pull request for this window: A few driver fixes have piled up and one missed rcar bindings patch which got somehow lost in for-linus branch so cherry-picked that one. Fixes are for dw, at_hdmac, edma" * tag 'dmaengine-fix-4.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: rcar-dmac: Document SoC specific bindings dmaengine: at_xdmac: fix resume for cyclic transfers dmaengine: dw: fix cyclic transfer callbacks dmaengine: dw: fix cyclic transfer setup dmaengine: edma: Fix paRAM slot allocation for entry channel 0
Diffstat (limited to 'fs/ocfs2/cluster')
0 files changed, 0 insertions, 0 deletions