From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 4 Mar 2015 20:23:20 +0000 (+0100)
Subject: Merge tag 'renesas-soc-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~1897^2~19
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aa5c86ce1d64b0793a4c21c1e7902d77ab886817;p=firefly-linux-kernel-4.4.55.git

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
---

aa5c86ce1d64b0793a4c21c1e7902d77ab886817