]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'v3.19-rockchip-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Nov 2014 16:18:43 +0000 (17:18 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Nov 2014 16:18:43 +0000 (17:18 +0100)
commit4ee5a7e7df21dc8ee8ea5c93b5954235191d4b52
treee2c084add2bab79a1407cde49cbbc76ea036680c
parentc97a96937c7d79aaa9ddc9868a8414b47d63364a
parentbfa8fbb1bb3f2429cb37656922b28c5384629225
Merge tag 'v3.19-rockchip-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc

Pull "code part of the rk3288 smp support" from Heiko Stübner:

here is the second batch of soc related changes, consisting only
of the smp support for rk3288.

Due to the slight misheap of the v3.18 cpuclk pull being merge, it is based
on exactly this merge commit from Olof to next/soc.

* tag 'v3.19-rockchip-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: add basic smp support for rk3288
  ARM: rockchip: add option to access the pmu via a phandle in smp_operations
  ARM: rockchip: convert to regmap and use pmu syscon if available

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