]> git.proxmox.com Git - mirror_ubuntu-hirsute-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)
commit8673bcef8c1b07b83e9ee02d5e7f4b66507b03cd
treebc08b79fe11c4745434da1cebc5fb8936f9c6831
parente43a34e3ec5d1b14a11c3220f5a12aa797d73cd1
parente7c0fe2a5c84b7bf4dcbbce30953b04b95e9dc09
Merge branch 'topic/bam' into for-linus

Conflicts:
drivers/dma/Makefile

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