Merge branch 'topic/univ_api' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Wed, 6 Jan 2016 09:47:32 +0000 (15:17 +0530)
committerVinod Koul <vinod.koul@intel.com>
Wed, 6 Jan 2016 09:47:32 +0000 (15:17 +0530)
commit7c7b680fa6b0866af2c4876da261bbfe710315d6
tree6f2449fdecb4edab3309d40959309ca80d2bb71d
parent5eec94388db40ce45bec028af2e2f62df751c887
parent020c62ae38946cae01571a0b4e6f445dfdb7ec1c
Merge branch 'topic/univ_api' into for-linus
drivers/dma/dmaengine.c
drivers/dma/edma.c
include/linux/dmaengine.h