diff options
author | Linus Torvalds | 2014-09-28 22:45:16 +0200 |
---|---|---|
committer | Linus Torvalds | 2014-09-28 22:45:16 +0200 |
commit | 4092dc8f0bcc0963c045460157107d7461a094d7 (patch) | |
tree | 2f659d7ce5b5ea8e9fc27292e69f0b2a84caee04 /arch/s390/mm/init.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
parent | dmaengine: omap-dma: Restore the CLINK_CTRL in resume path (diff) | |
download | kernel-qcow2-linux-4092dc8f0bcc0963c045460157107d7461a094d7.tar.gz kernel-qcow2-linux-4092dc8f0bcc0963c045460157107d7461a094d7.tar.xz kernel-qcow2-linux-4092dc8f0bcc0963c045460157107d7461a094d7.zip |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul:
"Two small fixes for omap dmaengine driver which fixes cyclic suspend
and resume"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: omap-dma: Restore the CLINK_CTRL in resume path
dmaengine: omap-dma: Add memory barrier to dma_resume path
Diffstat (limited to 'arch/s390/mm/init.c')
0 files changed, 0 insertions, 0 deletions