summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-04-11 21:32:21 +0400
committerOlof Johansson <olof@lixom.net>2013-04-11 21:32:39 +0400
commitf6940610c76e9a6dbb23cef51b64fd48877b68df (patch)
tree535d759034c9a4fc5f3555b45cb7758a2809144c /firmware
parent432b473419d9833ff9c48c768f2c8de35185609e (diff)
parentab5fdfd5ea621b629da9bfda987af301da973525 (diff)
downloadlinux-f6940610c76e9a6dbb23cef51b64fd48877b68df.tar.xz
Merge tag 'renesas-soc-r8a7790-for-v3.10' of git://git.kernel.org/pub/scm/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 <olof@lixom.net>
Diffstat (limited to 'firmware')
0 files changed, 0 insertions, 0 deletions