From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Apr 2014 16:58:57 +0000 (-0700)
Subject: Merge branch 'fixes_for_v3.15' of git://git.linaro.org/people/mszyprowski/linux-dma... 
X-Git-Tag: MMI-PSA29.97-13-9~12308
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=92891ed6b1fdb49655f9a071ef2880a567807375;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'fixes_for_v3.15' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull dma-mapping fix from Marek Szyprowski:
 "A small fix for dma-mapping subsystem for ARM"

* 'fixes_for_v3.15' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  arm: dma-mapping: Fix mapping size value
---

92891ed6b1fdb49655f9a071ef2880a567807375