| commit | 2821e26f3a0a3872184581caac8115bb02641941 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jan 25 14:32:51 2020 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jan 25 14:32:51 2020 -0800 |
| tree | 723cdf6f8da9f40652cbd8ed35d2da461dfebf58 | |
| parent | 84809aaf78b5b4c2e6478dc6121a1c8fb439a024 [diff] | |
| parent | 6849b5eba1965ceb0cad3a75877ef4569dd3638e [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