From: Mark Brown <broonie@linaro.org>
Date: Mon, 24 Jun 2013 11:28:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/fix/pxa' into spi-linus
X-Git-Tag: v3.10~25^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2f5a5c1be8b2eb1e2a1e77566a65d3c4f330d3c9;p=users%2Fhch%2Fdma-mapping.git

Merge remote-tracking branch 'spi/fix/pxa' into spi-linus
---

2f5a5c1be8b2eb1e2a1e77566a65d3c4f330d3c9