Merge tag 'v3.17-rockchip-smp-hotplug' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Sat, 26 Jul 2014 15:34:26 +0000 (17:34 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 26 Jul 2014 15:34:26 +0000 (17:34 +0200)
commit03eea7cda20128f97fa281650ada69fe19194d56
tree9260e5bbf196bdfa6b1d23a3b3203fa19f45886c
parent71b4807a82d00a1d80d7ef73167ffa824db7d461
parentf54b91fdfa7a1b5603d6d00f9972765662a4e6ef
Merge tag 'v3.17-rockchip-smp-hotplug' of git://git./linux/kernel/git/mmind/linux-rockchip into next/soc

Merge "CPU-Hotplug support for RK3066 and RK3188" from Heiko Stuebner:

* tag 'v3.17-rockchip-smp-hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: Add cpu hotplug support for RK3XXX SoCs
  ARM: rockchip: select ARMv7 compiler flags for platsmp.o

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