Merge branch 'topic/zxdma' into for-linus
commitb2b48ac4c584ae31eb23ad1f86964cc6e52eaa54
authorVinod Koul <vinod.koul@intel.com>
Sun, 23 Aug 2015 13:24:39 +0000 (23 18:54 +0530)
committerVinod Koul <vinod.koul@intel.com>
Sun, 23 Aug 2015 13:24:39 +0000 (23 18:54 +0530)
tree9e973522bc1f407be44afdee3743b227c945007d
parent76891cc8c4930e21b9bce226524f1b57756bc25e
parented9c87b33147e5b007e66a282b9c8c307fbf8bf9
Merge branch 'topic/zxdma' into for-linus
drivers/dma/Kconfig
drivers/dma/Makefile