| commit | 92891ed6b1fdb49655f9a071ef2880a567807375 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 24 09:58:57 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 24 09:58:57 2014 -0700 |
| tree | f86be60d63d93815a2efb04d0ff3aa65c90cde8f | |
| parent | fdd324aa5fcaf3cc82f71bde51bf884436c9a986 [diff] | |
| parent | 59f0f119e85cfb173db518328b55efbac4087c9f [diff] |
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