]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1d0c2dfc804d9f1ce2e348242b870984b49dae54
tree64ecce9f31a7b88f16851d9deaf04af0d8611205
parent6993a3b19339725b0777488e8f582dbac4ebb970
parent3996a9c3bb032008e44cd4107bb45598cd7a50be
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