projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5eec943 020c62a)
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)
1  2 
drivers/dma/dmaengine.c patch | diff1 | diff2 | blob | history
drivers/dma/edma.c patch | diff1 | diff2 | blob | history
include/linux/dmaengine.h patch | diff1 | diff2 | blob | history

diff --cc drivers/dma/dmaengine.c
Simple merge
diff --cc drivers/dma/edma.c
Simple merge
diff --cc include/linux/dmaengine.h
Simple merge
Domain: System / Kernel;