From: Olof Johansson Date: Wed, 24 Sep 2014 18:17:26 +0000 (-0700) Subject: Merge tag 'renesas-soc4-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: firefly_0821_release~176^2~3111^2~15 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=739d8d8bc33488ef11b34875e84860db7e09c8b4;p=firefly-linux-kernel-4.4.55.git Merge tag 'renesas-soc4-for-v3.18' of git://git./linux/kernel/git/horms/renesas into next/soc Merge "Fourth Round of Renesas ARM Based SoC Soc Updates for v3.18" from Simon Horman: Fourth Round of Renesas ARM Based SoC Soc Updates for v3.18 * r8a7794: Remove unnecessary #ifdef CONFIG_USE_OF * tag 'renesas-soc4-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7794: Remove unnecessary #ifdef CONFIG_USE_OF Signed-off-by: Olof Johansson --- 739d8d8bc33488ef11b34875e84860db7e09c8b4