From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 21 Feb 2009 21:42:50 +0000 (+0000)
Subject: Merge branch 'dma' into devel
X-Git-Tag: kvm-85rc2~4^2~7^2~52^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=22b61a11fd4e6d7a48d694ce350331bebc0394ed;p=users%2Fdwmw2%2Flinux.git

Merge branch 'dma' into devel

Conflicts:

	arch/arm/plat-mxc/dma-mx1-mx2.c
---

22b61a11fd4e6d7a48d694ce350331bebc0394ed