Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Dec 2019 00:12:39 +0000 (16:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Dec 2019 00:12:39 +0000 (16:12 -0800)
commiteea2d5da29e396b6cc1fb35e36bcbf5f57731015
tree4e31d0e6aef22ef7b0b17c8776d5dc59e8e257b9
parent347f56fb389012e8ba7b391d35d109eb16773e3b
parent04bb96427d4ee33fbdf15648ddf578c6ba1aef54
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:

 - fix CPU topology setup for SCHED_MC case

 - fix VDSO regression

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8947/1: Fix __arch_get_hw_counter() access to CNTVCT
  ARM: 8943/1: Fix topology setup in case of CPU hotplug for CONFIG_SCHED_MC