From: Joerg Roedel <joerg.roedel@amd.com>
Date: Tue, 6 Sep 2011 12:59:21 +0000 (+0200)
Subject: Merge branches 'debug/dma-api', 'arm/omap', 'arm/msm' and 'core' into api-2
X-Git-Tag: v3.2-rc1~117^2^5~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=51acc0bcfc91987ed38195918e0b40ff05197585;p=users%2Fwilly%2Flinux.git

Merge branches 'debug/dma-api', 'arm/omap', 'arm/msm' and 'core' into api-2
---

51acc0bcfc91987ed38195918e0b40ff05197585