diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2017-06-04 16:21:52 +0300 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-06-04 16:21:52 +0300 |
commit | 978267b6430c07d62cb38f83e058a3132c52eca1 (patch) | |
tree | 1a744c8230cd5a72adc363ca93458a748c664abe /arch/blackfin/mach-bf533/Kconfig | |
parent | 6bc51cbaa9d75c7c240282da5ff270815caccac0 (diff) | |
parent | ff86bf0c65f14346bf2440534f9ba5ac232c39a0 (diff) | |
download | linux-978267b6430c07d62cb38f83e058a3132c52eca1.tar.xz |
Merge branch 'timers/urgent' into WIP.timers
Pick up urgent fixes to avoid conflicts.
Diffstat (limited to 'arch/blackfin/mach-bf533/Kconfig')
0 files changed, 0 insertions, 0 deletions