diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-16 16:10:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-16 16:10:26 -0400 |
commit | a4ae54f90e0a7063799eb90852aa8648ccfbb791 (patch) | |
tree | 88fd7f7920c8849fed99c782ab1fc605da69a375 /virt | |
parent | 3369d116934b70bd2755cdd8b2af9741d18a4047 (diff) | |
parent | 63ce2cc474ce962d936ae6dfaa6ae2354b1db5b2 (diff) | |
download | linux-a4ae54f90e0a7063799eb90852aa8648ccfbb791.tar.gz |
Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer code update from Thomas Gleixner: - armada SoC clocksource overhaul with a trivial merge conflict - Minor improvements to various SoC clocksource drivers * 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clocksource: armada-370-xp: Add detailed clock requirements in devicetree binding clocksource: armada-370-xp: Get reference fixed-clock by name clocksource: armada-370-xp: Replace WARN_ON with BUG_ON clocksource: armada-370-xp: Fix device-tree binding clocksource: armada-370-xp: Introduce new compatibles clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE clocksource: armada-370-xp: Simplify TIMER_CTRL register access clocksource: armada-370-xp: Use BIT() ARM: timer-sp: Set dynamic irq affinity ARM: nomadik: add dynamic irq flag to the timer clocksource: sh_cmt: 32-bit control register support clocksource: em_sti: Convert to devm_* managed helpers
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions