diff options
author | 2019-05-01 15:45:36 +0100 | |
---|---|---|
committer | 2019-05-01 15:45:36 +0100 | |
commit | 24cf262da1ad303fc940c798aab0bd1bd50e3fc2 (patch) | |
tree | da38a3ae51128dfb959fb53d633201ab4ffb4209 /scripts/gen_compile_commands.py | |
parent | Merge branch 'for-next/mitigations' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into for-next/core (diff) | |
parent | clocksource/arm_arch_timer: Use arch_timer_read_counter to access stable counters (diff) | |
download | linux-dev-24cf262da1ad303fc940c798aab0bd1bd50e3fc2.tar.xz linux-dev-24cf262da1ad303fc940c798aab0bd1bd50e3fc2.zip |
Merge branch 'for-next/timers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into for-next/core
Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/arch_timer.h
Diffstat (limited to 'scripts/gen_compile_commands.py')
0 files changed, 0 insertions, 0 deletions