projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 29ae8a6 d50314a)
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jul 2014 00:47:36 +0000 (17:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jul 2014 00:47:36 +0000 (17:47 -0700)
commit98de5ab7138bdb78ba1cf50978201a4c21bdb111
tree023a82b35f7841c37b6b7559bfcabfd8fa202357tree | snapshot
parent29ae8a6a281445ae5fe69287cf1165326978b1c7commit | diff
parentd50314a6b0702c630c35b88148c1acb76d2e4edecommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.