diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-03-04 21:23:20 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-03-04 21:23:20 +0100 |
| commit | aa5c86ce1d64b0793a4c21c1e7902d77ab886817 (patch) | |
| tree | 7fd74b9aecbeb31a6c0dc6f9d6053933fd8cbaed /arch/arm/mach-realview/core.h | |
| parent | 13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff) | |
| parent | 744cadba1ae6b80b413aea87835855dcccad86fd (diff) | |
Merge tag 'renesas-soc-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Pull "Renesas ARM Based SoC Updates for v4.1" from Simon Horman:
* Do not make CMA reservation for R-Car Gen2 when HIGHMEM=n
* tag 'renesas-soc-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: No R-Car Gen2 CMA reservation when HIGHMEM=n
Diffstat (limited to 'arch/arm/mach-realview/core.h')
0 files changed, 0 insertions, 0 deletions