From: Olof Johansson Date: Thu, 11 Apr 2013 17:32:21 +0000 (-0700) Subject: Merge tag 'renesas-soc-r8a7790-for-v3.10' of git://git.kernel.org/pub/scm/linux/kerne... X-Git-Tag: v3.10-rc1~64^2~3 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=f6940610c76e9a6dbb23cef51b64fd48877b68df;p=cascardo%2Flinux.git Merge tag 'renesas-soc-r8a7790-for-v3.10' of git://git./linux/kernel/git/horms/renesas into next/soc2 From Simon Horman: Renesas ARM based r8a7790 SoC update for v3.10 * Force architecture timer to be activated regardless of bootloader - This is necessary for the lager board to boot * Add second memory range to r8a7790 PFC device - This is in preparation for further PFC work. It should not break anything as it is not used yet. This pull request is based on: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc2-for-v3.10 * tag 'renesas-soc-r8a7790-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: force enable of r8a7790 arch timer ARM: shmobile: Add second I/O range for r8a7790 PFC Signed-off-by: Olof Johansson --- f6940610c76e9a6dbb23cef51b64fd48877b68df