]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 04578e8 bff9a10)
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Nov 2018 16:15:15 +0000 (08:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Nov 2018 16:15:15 +0000 (08:15 -0800)
Pull more timer updates from Thomas Gleixner:
 "A set of commits for the new C-SKY architecture timers"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  dt-bindings: timer: gx6605s SOC timer
  clocksource/drivers/c-sky: Add gx6605s SOC system timer
  dt-bindings: timer: C-SKY Multi-processor timer
  clocksource/drivers/c-sky: Add C-SKY SMP timer

1  2 
drivers/clocksource/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/clocksource/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.