summaryrefslogtreecommitdiffstats
path: root/drivers/sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-04 15:57:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-04 15:57:20 -0700
commit82e627eb5e07d7993216c9e63fb5550cf6ed25d7 (patch)
tree9319298431a1ee815b2590600c13d1806818c7ff /drivers/sh
parentf1a7cd0ffe8c4ecd57a55aab7cfd4c813e0f5f3d (diff)
parent331b483f42fb4d04d52ce920ae10a71411c859a4 (diff)
downloadlinux-82e627eb5e07d7993216c9e63fb5550cf6ed25d7.tar.gz
linux-82e627eb5e07d7993216c9e63fb5550cf6ed25d7.tar.bz2
linux-82e627eb5e07d7993216c9e63fb5550cf6ed25d7.zip
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
Pull timer core updates from Thomas Gleixner: "This time you get nothing really exciting: - A huge update to the sh* clocksource drivers - Support for two more ARM SoCs - Removal of the deprecated setup_sched_clock() API - The usual pile of fixlets all over the place" * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits) clocksource: Add Freescale FlexTimer Module (FTM) timer support ARM: dts: vf610: Add Freescale FlexTimer Module timer node. clocksource: ftm: Add FlexTimer Module (FTM) Timer devicetree Documentation clocksource: sh_tmu: Remove unnecessary OOM messages clocksource: sh_mtu2: Remove unnecessary OOM messages clocksource: sh_cmt: Remove unnecessary OOM messages clocksource: em_sti: Remove unnecessary OOM messages clocksource: dw_apb_timer_of: Do not trace read_sched_clock clocksource: Fix clocksource_mmio_readX_down clocksource: Fix type confusion for clocksource_mmio_readX_Y clocksource: sh_tmu: Fix channel IRQ retrieval in legacy case clocksource: qcom: Implement read_current_timer for udelay ntp: Make is_error_status() use its argument ntp: Convert simple_strtol to kstrtol timer_stats/doc: Fix /proc/timer_stats documentation sched_clock: Remove deprecated setup_sched_clock() API ARM: sun6i: a31: Add support for the High Speed Timers clocksource: sun5i: Add support for reset controller clocksource: efm32: use $vendor,$device scheme for compatible string KConfig: Vexpress: build the ARM_GLOBAL_TIMER with vexpress platform ...
Diffstat (limited to 'drivers/sh')
0 files changed, 0 insertions, 0 deletions