From: Vinod Koul <vinod.koul@intel.com>
Date: Sat, 5 Apr 2014 15:15:55 +0000 (+0530)
Subject: Merge branch 'topic/bam' into for-linus
X-Git-Tag: v3.15-rc1~39^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8673bcef8c1b07b83e9ee02d5e7f4b66507b03cd;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'topic/bam' into for-linus

Conflicts:
	drivers/dma/Makefile

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

8673bcef8c1b07b83e9ee02d5e7f4b66507b03cd