]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
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)
commit8cd0f1c3b3060261fc20f77e0bfbf974e51c5f07
treef2ffa9150e916bcbde8498019c7b7526af97e48b
parent28af932230caa60a3068dc06e146996113305862
parente4e886c6b1e2a1ef9654d26dad1c3baca8139b3c
Merge branch 'topic/edma' into next

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Conflicts:
drivers/dma/edma.c
arch/arm/mach-omap2/Kconfig
drivers/dma/Kconfig