Merge tag 'renesas-soc-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Wed, 4 Mar 2015 20:23:20 +0000 (21:23 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 4 Mar 2015 20:23:20 +0000 (21:23 +0100)
commitaa5c86ce1d64b0793a4c21c1e7902d77ab886817
tree7fd74b9aecbeb31a6c0dc6f9d6053933fd8cbaed
parent13a7a6ac0a11197edcd0f756a035f472b42cdf8b
parent744cadba1ae6b80b413aea87835855dcccad86fd
Merge tag 'renesas-soc-for-v4.1' of git://git./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