From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Jan 2020 22:32:51 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2821e26f3a0a3872184581caac8115bb02641941;p=linux.git

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:

 - fix ftrace relocation type filtering

 - relax arch timer version check

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8955/1: virt: Relax arch timer version check during early boot
  ARM: 8950/1: ftrace/recordmcount: filter relocation types
---

2821e26f3a0a3872184581caac8115bb02641941