projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84809aa 6849b5e)
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Jan 2020 22:32:51 +0000 (14:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Jan 2020 22:32:51 +0000 (14:32 -0800)
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


Trivial merge
Domain: System / Kernel;