]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
projects / mirror_ubuntu-bionic-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 907977b 8d09617)
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Apr 2017 16:22:03 +0000 (09:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Apr 2017 16:22:03 +0000 (09:22 -0700)
Pull timer fixes from Thomas Gleixner:
 "Two small fixes for the new CLKEVT_OF infrastructure"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  vmlinux.lds: Add __clkevt_of_table to kernel
  clockevents: Fix syntax error in clkevt-of macro

1  2 
include/asm-generic/vmlinux.lds.h patch | diff1 | diff2 | blob | history

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge
ubuntu-bionic-kernel mirror