From: Vinod Koul <vinod.koul@intel.com>
Date: Wed, 30 Oct 2013 07:37:18 +0000 (+0530)
Subject: Merge branch 'for-linus' into next
X-Git-Tag: v3.13-rc1~29^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b967aecf1714c10d1e6c045e43b6385884f1ca77;p=pandora-kernel.git

Merge branch 'for-linus' into next

Conflicts:
	drivers/dma/edma.c
Moved the memory leak fix post merge

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

b967aecf1714c10d1e6c045e43b6385884f1ca77
Reading git-diff-tree failed