From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 19 May 2014 06:42:27 +0000 (+1000)
Subject: Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
X-Git-Tag: next-20140519~13
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ccec0f20c058aa3d298bd1a09f0c8cd2522e0f7c;p=karo-tx-linux.git

Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
---

ccec0f20c058aa3d298bd1a09f0c8cd2522e0f7c