Merge tag 'v3.15-rockchip-smp' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind...
authorOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 06:55:31 +0000 (22:55 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 06:55:31 +0000 (22:55 -0800)
commitc381585fcc2426da35a6388fcc72a91ecd4f9add
treee76ef91de1726ec83656dac09184c5768541f527
parent6c41a9979c3f2d5c9cf3458dda3fdb6542535df8
parenta7a2b3118b410fb3cd3a8363b157c56f4211ee05
Merge tag 'v3.15-rockchip-smp' of git://git./linux/kernel/git/mmind/linux-rockchip into next/soc

Merge Rockchip SMP support from Heiko Stübner:

SMP-support for RK3066 and RK3188 SoCs from Rockchip.

* tag 'v3.15-rockchip-smp' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: add smp bringup code
  ARM: rockchip: add power-management-unit
  ARM: rockchip: add sram dt nodes and documentation
  ARM: rockchip: add snoop-control-unit

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