From: Vinod Koul <vinod.koul@intel.com>
Date: Thu, 2 May 2013 16:22:26 +0000 (+0530)
Subject: Merge branch 'topic/of' into for-linus
X-Git-Tag: v3.10-rc1~41^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2396f7984ea09e83d489cfca6d5da62cc22945a;p=pandora-kernel.git

Merge branch 'topic/of' into for-linus

Conflicts:
	include/linux/dmaengine.h

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

b2396f7984ea09e83d489cfca6d5da62cc22945a
Reading git-diff-tree failed