From: Arnd Bergmann Date: Thu, 25 Sep 2014 16:10:40 +0000 (+0200) Subject: Merge tag 'renesas-soc5-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v3.18-rc1~120^2~7 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/57e33ff1dba139a70723e922c5838499610b60c1 Merge tag 'renesas-soc5-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Pull "Fifth Round of Renesas ARM Based SoC Soc Updates for v3.18" from Simon Horman: * r8a7740: Fix documentation error copied from elsewhere * r8a7794: Reserve memory for CMA in a manner consistent to other R-Car Gen2 SoCs Signed-off-by: Arnd Bergmann * tag 'renesas-soc5-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7740 legacy: Fix copied bug in comment ARM: shmobile: r8a7794: Reserve memory as other R-Car Gen2 SoCs --- 57e33ff1dba139a70723e922c5838499610b60c1