commit 739d8d8bc33488ef11b34875e84860db7e09c8b4
author Olof Johansson <olof@lixom.net> Wed Sep 24 11:17:26 2014 -0700
committer Olof Johansson <olof@lixom.net> Wed Sep 24 11:17:43 2014 -0700
tree c12e2bed952387bc8e5408c260477b07d213dc13
parent d66820853251e8a9b53125a95a773e482cd79136
parent 1370078db37de2aa5e906ae2b5dbbb6ba289adb4

Merge tag 'renesas-soc4-for-v3.18' of git://git.kernel.org/pub/scm/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 <olof@lixom.net>