Merge branch 'for-next/timers' of...
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
No related branches found
No related tags found
Showing
- Documentation/arm64/silicon-errata.txt 1 addition, 0 deletionsDocumentation/arm64/silicon-errata.txt
- arch/arm/include/asm/arch_timer.h 16 additions, 2 deletionsarch/arm/include/asm/arch_timer.h
- arch/arm/include/asm/cp15.h 2 additions, 0 deletionsarch/arm/include/asm/cp15.h
- arch/arm/vdso/vgettimeofday.c 3 additions, 2 deletionsarch/arm/vdso/vgettimeofday.c
- arch/arm64/Kconfig 7 additions, 5 deletionsarch/arm64/Kconfig
- arch/arm64/include/asm/arch_timer.h 66 additions, 20 deletionsarch/arm64/include/asm/arch_timer.h
- arch/arm64/include/asm/cputype.h 2 additions, 0 deletionsarch/arm64/include/asm/cputype.h
- arch/arm64/kernel/cpu_errata.c 11 additions, 2 deletionsarch/arm64/kernel/cpu_errata.c
- arch/arm64/kernel/entry.S 17 additions, 2 deletionsarch/arm64/kernel/entry.S
- arch/arm64/kernel/traps.c 2 additions, 2 deletionsarch/arm64/kernel/traps.c
- drivers/clocksource/arm_arch_timer.c 57 additions, 73 deletionsdrivers/clocksource/arm_arch_timer.c
- drivers/watchdog/sbsa_gwdt.c 1 addition, 1 deletiondrivers/watchdog/sbsa_gwdt.c
Loading
Please register or sign in to comment