From: Vinod Koul <vinod.koul@intel.com>
Date: Tue, 7 Jan 2014 16:06:24 +0000 (+0530)
Subject: Merge branch 'topic/of' into for-linus
X-Git-Tag: v3.14-rc1~48^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0adcdeed6f87ac7230c9a0364ac785b8e70ad275;p=pandora-kernel.git

Merge branch 'topic/of' into for-linus

Conflicts:
	drivers/dma/mmp_pdma.c

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

0adcdeed6f87ac7230c9a0364ac785b8e70ad275
Reading git-diff-tree failed