summaryrefslogtreecommitdiff
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-10-22 10:23:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-22 10:23:15 -0700
commit0c2b6dc4fd4fa13796b319aae969a009f03222c6 (patch)
tree82800291c44976174d561ce95914a214dc8b10b9 /drivers/Makefile
parent3e9679a365d3b92ae770066cd0e3a2c01fcc64e2 (diff)
parent593876838826914a7e4e05fbbcb728be6fbc4d89 (diff)
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer updates from Thomas Gleixner: "This updates contains: - A revert which addresses a boot failure on ARM Sun5i platforms - A new clocksource driver, which has been delayed beyond rc1 due to an interrupt driver issue which was unearthed by this driver. The debugging of that issue and the discussion about the proper solution made this driver miss the merge window. There is no point in delaying it for a full cycle as it completes the basic mainline support for the new JCore platform and does not create any risk outside of that platform" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: Revert "clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init" clocksource: Add J-Core timer/clocksource driver of: Add J-Core timer bindings
Diffstat (limited to 'drivers/Makefile')
0 files changed, 0 insertions, 0 deletions