projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit2821e26f3a0a3872184581caac8115bb02641941
tree723cdf6f8da9f40652cbd8ed35d2da461dfebf58tree | snapshot
parent84809aaf78b5b4c2e6478dc6121a1c8fb439a024commit | diff
parent6849b5eba1965ceb0cad3a75877ef4569dd3638ecommit | diff
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
John Crispins staging tree