From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 18 Jul 2011 22:00:42 +0000 (+0100)
Subject: Merge branch 'dma' of http://git.linaro.org/git/people/nico/linux into devel-stable
X-Git-Tag: v3.1-rc1~258^2^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=07f1c295de593ec0b0dca3092299c048c03374da;p=linux.git

Merge branch 'dma' of http://git.linaro.org/git/people/nico/linux into devel-stable
---

07f1c295de593ec0b0dca3092299c048c03374da