Merge tag 'renesas-fixes3-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Tue, 10 Sep 2013 00:15:32 +0000 (17:15 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 10 Sep 2013 00:15:32 +0000 (17:15 -0700)
commitafba951eab92ce43ff1fa1c3366cc6fec825936c
tree155b9009da3a7d8fefd7e7e80e246de7070e0964
parentd5ece9373c6e0f95ae59f303810e1ccbcd044629
parent7658ea2fb57831c6836ffcfb20bcb84f3ff55dfb
Merge tag 'renesas-fixes3-for-v3.12' of git://git./linux/kernel/git/horms/renesas into fixes

From Simon Horman:
Third Round of Renesas ARM based SoC fixes for v3.12

* Update early timer initialisation order of r8a7779 SoC

This resolves a regression introduced by
a894fcc2d01a89e6fe3da0845a4d80a5312e1124 ("ARM: smp_twd: Divorce smp_twd
from local timer API").

This problem was introduced in v3.10-rc2.

* tag 'renesas-fixes3-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7779: Update early timer initialisation order

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-shmobile/setup-r8a7779.c