]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit50a75eaf259a14645e33c74e50de15a81c15cc74
treebc08b79fe11c4745434da1cebc5fb8936f9c6831
parent8d0b54b6dd732de4dd9c256e4dd4fba3501bdfaf
parentc968ae132cf3d9218f96ae13344c84a101e8bda3
Merge branch 'topic/bam' into for-linus

Conflicts:
drivers/dma/Makefile

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/Kconfig