Merge branch 'topic/sprd' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Tue, 14 Nov 2017 05:06:09 +0000 (10:36 +0530)
committerVinod Koul <vinod.koul@intel.com>
Tue, 14 Nov 2017 05:06:09 +0000 (10:36 +0530)
commit135ab7f53cfb77bd0b215b68eed006c7825ea01e
tree64ecce9f31a7b88f16851d9deaf04af0d8611205
parent9c6027133626efd773fa84478c5d8c9209df41f6
parent9b3b8171f7f4ecbbc28f3c1ae60462826a5d9072
Merge branch 'topic/sprd' into for-linus

Kconfig and Makefile conflicts so put them in right order (sprd ones after
stm ones)

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/Kconfig
drivers/dma/Makefile