]> 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)
commitdf6c5a39b17a1dfd059b0803208edfd0e0e2d325
tree64ecce9f31a7b88f16851d9deaf04af0d8611205
parent3fed03ee792f64ac1b636dc7bfeed071fca3aaff
parentd83b8b034b493894e9efe0ed1a345f3e59ffb13d
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