]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'renesas-soc3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Sun, 13 Jul 2014 04:23:07 +0000 (21:23 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 13 Jul 2014 04:23:24 +0000 (21:23 -0700)
commit84e73b71df03d6a527d0ee1083556af1252cdb3e
treec2d40590036203677c75708cc2529061b6830718
parent4f6ac69190e8ddbd06c1b951a71f15cef9b9ff29
parentb2ac80fef54dbdc19db55a9b049f1921ef5ffd16
Merge tag 'renesas-soc3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Merge "Third Round of Renesas ARM Based SoC Updates for v3.17" from Simon
Horman:

- Correct build failure in APMU code in the case of !SUSPEND

* tag 'renesas-soc3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPEND

Signed-off-by: Olof Johansson <olof@lixom.net>