aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/direct.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-15 20:35:01 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-15 20:35:01 -0400
commit56b880e2e38da6c76c454052a93c0a92aa3586f7 (patch)
tree3c37784b36901cafed61f5aeee7d3d7c40c3b424 /fs/nfs/direct.c
parent1043e3becfbae0bee618f9b4f9598b145c4774e1 (diff)
parentc080e26edc3a2a3cdfa4c430c663ee1c3bbd8fae (diff)
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
Diffstat (limited to 'fs/nfs/direct.c')
0 files changed, 0 insertions, 0 deletions