projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6df056d e3faf2b)
Merge branch 'topic/edma' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Sat, 31 Oct 2015 02:06:55 +0000 (07:36 +0530)
committerVinod Koul <vinod.koul@intel.com>
Sat, 31 Oct 2015 02:06:55 +0000 (07:36 +0530)
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Conflicts:
drivers/dma/edma.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.