Learn more about cloning repositories
You have read-only access
Merge branch 'sh/dmaengine' Conflicts: arch/sh/drivers/dma/dma-sh.c