Merge branch 'topic/jz' into for-linus
authorVinod Koul <vkoul@kernel.org>
Wed, 24 Oct 2018 08:16:04 +0000 (09:16 +0100)
committerVinod Koul <vkoul@kernel.org>
Wed, 24 Oct 2018 08:16:04 +0000 (09:16 +0100)
commit81c3ee027e5d79eb184d2b225a67b06e9e5b9271
tree93099f59b6ce49265b2ebd943fc6f42d05644e7f
parentb29cf44398a93ae6ea9122f9b722faad0d280981
parentd426c517a7425dbd8e362051017b8acab20e8818
Merge branch 'topic/jz' into for-linus
drivers/dma/Kconfig
drivers/dma/dma-jz4780.c