From: Vinod Koul <vinod.koul@linux.intel.com>
Date: Thu, 17 Nov 2011 09:24:38 +0000 (+0530)
Subject: Merge branch 'dma_slave_direction' into next_test_dirn
X-Git-Tag: v3.3-rc1~19^2~35
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0d23ef29ed637dc6bd739f590985746d9ad9caa;p=pandora-kernel.git

Merge branch 'dma_slave_direction' into next_test_dirn

resolved conflicts:
	drivers/media/video/mx3_camera.c
---

e0d23ef29ed637dc6bd739f590985746d9ad9caa
Reading git-diff-tree failed