Merge branch 'topic/zx' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Tue, 21 Feb 2017 15:44:35 +0000 (21:14 +0530)
committerVinod Koul <vinod.koul@intel.com>
Tue, 21 Feb 2017 15:44:35 +0000 (21:14 +0530)
1  2 
drivers/dma/Kconfig

Simple merge