From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Jul 2014 00:47:36 +0000 (-0700)
Subject: Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
X-Git-Tag: v3.16-rc7~15
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=98de5ab7138bdb78ba1cf50978201a4c21bdb111;p=cascardo%2Flinux.git

Merge tag 'arm64-fixes' of git://git./linux/kernel/git/arm64/linux

Pull arm64 fix from Catalin Marinas:
 "Fix arm64 regression introduced by limiting the CMA buffer to ZONE_DMA
  on platforms where RAM starts above 4GB (and ZONE_DMA becoming 0)"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: Create non-empty ZONE_DMA when DRAM starts above 4GB
---

98de5ab7138bdb78ba1cf50978201a4c21bdb111