]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'topic/pxa' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Thu, 25 Jun 2015 03:51:58 +0000 (09:21 +0530)
committerVinod Koul <vinod.koul@intel.com>
Thu, 25 Jun 2015 03:51:58 +0000 (09:21 +0530)
1  2 
drivers/dma/Kconfig
drivers/dma/Makefile

Simple merge
Simple merge