diff options
| author | Will Deacon <will.deacon@arm.com> | 2019-05-01 10:45:36 -0400 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2019-05-01 10:45:36 -0400 |
| commit | 24cf262da1ad303fc940c798aab0bd1bd50e3fc2 (patch) | |
| tree | da38a3ae51128dfb959fb53d633201ab4ffb4209 /lib/netdev-notifier-error-inject.c | |
| parent | 50abbe19623e08e2aa34e0e526bd6115569f3dc3 (diff) | |
| parent | 0ea415390cd345b7d09e8c9ebd4b68adfe873043 (diff) | |
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 'lib/netdev-notifier-error-inject.c')
0 files changed, 0 insertions, 0 deletions