tree bc08b79fe11c4745434da1cebc5fb8936f9c6831
parent e43a34e3ec5d1b14a11c3220f5a12aa797d73cd1
parent e7c0fe2a5c84b7bf4dcbbce30953b04b95e9dc09
author Vinod Koul <vinod.koul@intel.com> 1396710955 +0530
committer Vinod Koul <vinod.koul@intel.com> 1396710955 +0530

Merge branch 'topic/bam' into for-linus

Conflicts:
	drivers/dma/Makefile

Signed-off-by: Vinod Koul <vinod.koul@intel.com>