Merge tag 'renesas-soc2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Wed, 19 Nov 2014 21:09:18 +0000 (22:09 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 19 Nov 2014 21:09:18 +0000 (22:09 +0100)
commit0a1d643450df407f299fc8260f676058ba7feff0
tree7b41554a84582448921c85b973ae17810c485c03
parentc39bacad19b0e4762508cb974a34f0ded67145e4
parent950a3f0e7dd32c372c9957d5c050b08de7ec9e56
Merge tag 'renesas-soc2-for-v3.19' of git://git./linux/kernel/git/horms/renesas into next/soc

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

* Enable PCI domains for R-Car Gen2 devices
* Make APMU resource code SoC-specific

* tag 'renesas-soc2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Enable PCI domains for R-Car Gen2 devices
  ARM: shmobile: r8a7791: Correct number of CPU cores
  ARM: shmobile: Separate APMU resource data into CPU dependant part

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