]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'renesas-soc3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Wed, 19 Nov 2014 21:11:03 +0000 (22:11 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 19 Nov 2014 21:11:03 +0000 (22:11 +0100)
commitb4e2c4bf4f7f63bebd1429753afb43e998247b1b
tree9a0e475a42758595428134de5a2a86cc8251589c
parent0a1d643450df407f299fc8260f676058ba7feff0
parente3d163329753b3b473f40c9be71561ed8eb98aea
Merge tag 'renesas-soc3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Pull "Third Round of Renesas ARM Based Soc Updates for v3.19" from Simon Horman:

* Always build rcar setup for armv7
  - Fixes allmodconfig build fauilre caused by
    "ARM: shmobile: always build rcar setup for armv7"
* Add restart callback to sh73a0

* tag 'renesas-soc3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: always build rcar setup for armv7
  ARM: shmobile: sh73a0: Add restart callback

Signed-off-by: Arnd Bergmann <arnd@arndb.de>