]> 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)
commit23b0bcfde3904059243b1d2e502f1f65019d032d
treebc08b79fe11c4745434da1cebc5fb8936f9c6831
parentbb554575800d2952a66c7f948ca73038537b2b57
parent286fb241f54a5565b6f7f2838ccd2ffd09fef807
Merge branch 'topic/bam' into for-linus

Conflicts:
drivers/dma/Makefile

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