From: Vinod Koul <vinod.koul@linux.intel.com>
Date: Fri, 2 Sep 2011 11:13:44 +0000 (+0530)
Subject: Merge branch 'next' into v3.1-rc4
X-Git-Tag: v3.2-rc1~47^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8516f52fa497b37eb3d5e58d34e61a41ae0a553a;p=pandora-kernel.git

Merge branch 'next' into v3.1-rc4

Fixed trivial conflicts  in  drivers/dma/amba-pl08x.c

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

8516f52fa497b37eb3d5e58d34e61a41ae0a553a
Reading git-diff-tree failed