]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'renesas-boards-lager-for-v3.10' of git://git.kernel.org/pub/scm/linux...
authorOlof Johansson <olof@lixom.net>
Thu, 11 Apr 2013 17:35:25 +0000 (10:35 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 11 Apr 2013 17:36:42 +0000 (10:36 -0700)
commitc6770e58b28ebcc76134f4238ffbcec9c52a3d20
treecf01bdb4884f59277caef88fc490191824f6fc8c
parentd941b2ed203a2542067a6a4de352c7d3fe3c6963
parent08f980713bade5438e435e7311f6d17bbf0571ce
Merge tag 'renesas-boards-lager-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards2

From Simon Horman:
Renesas ARM based SoC lager board updates for v3.10

* Use r8a7790 timer setup code to force the
  arch timer to be enabled regardless of the bootloader setting
  - This is necessary for the lager board to boot

This pull request is based on:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-boards3-for-v3.10
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-r8a7790-for-v3.10

The merge was made to provide the r8a7790 timer setup code

* tag 'renesas-boards-lager-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: use r8a7790 timer setup code on Lager
  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>