From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Jun 2012 00:35:01 +0000 (-0700)
Subject: Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma... 
X-Git-Tag: v3.5-rc3~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=56b880e2e38da6c76c454052a93c0a92aa3586f7;p=~emulex%2Finfiniband.git

Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull DMA-mapping fixes from Marek Szyprowski:
 "A set of minor fixes for dma-mapping code (ARM and x86) required for
  Contiguous Memory Allocator (CMA) patches merged in v3.5-rc1."

* 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  x86: dma-mapping: fix broken allocation when dma_mask has been provided
  ARM: dma-mapping: fix debug messages in dmabounce code
  ARM: mm: fix type of the arm_dma_limit global variable
  ARM: dma-mapping: Add missing static storage class specifier
---

56b880e2e38da6c76c454052a93c0a92aa3586f7