projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e43a34e e7c0fe2)
Merge branch 'topic/bam' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Sat, 5 Apr 2014 15:15:55 +0000 (20:45 +0530)
committerVinod Koul <vinod.koul@intel.com>
Sat, 5 Apr 2014 15:15:55 +0000 (20:45 +0530)
Conflicts:
drivers/dma/Makefile

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
1  2 
drivers/dma/Kconfig patch | diff1 | diff2 | blob | history

diff --cc drivers/dma/Kconfig
Simple merge
Linux Kernel tree with some unpolished code for Colibri/Apalis modules