]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'topic/edma' into next
authorVinod Koul <vinod.koul@intel.com>
Wed, 14 Oct 2015 14:28:45 +0000 (19:58 +0530)
committerVinod Koul <vinod.koul@intel.com>
Wed, 14 Oct 2015 14:28:45 +0000 (19:58 +0530)
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Conflicts:
drivers/dma/edma.c

1  2 
arch/arm/mach-omap2/Kconfig
drivers/dma/Kconfig

Simple merge
Simple merge