projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71b4807 f54b91f)
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)
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>

Trivial merge