diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 15:26:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 15:26:10 -0800 |
| commit | 8c334ce8f0fec7122fc3059c52a697b669a01b41 (patch) | |
| tree | 8dc9226227b041a55f98089cc5c82522e8cab58e /MAINTAINERS | |
| parent | 3c6847eaa3da59f3bbe15eb3004ddab41ae6a201 (diff) | |
| parent | f40d149b58f5dea148ceaee5f9249da133e5004c (diff) | |
| download | linux-8c334ce8f0fec7122fc3059c52a697b669a01b41.tar.gz linux-8c334ce8f0fec7122fc3059c52a697b669a01b41.tar.bz2 linux-8c334ce8f0fec7122fc3059c52a697b669a01b41.zip | |
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull clocksource updates from Ingo Molnar:
"The main change in this tree is the addition of various new SoC
clocksource/clockevents drivers: Conexant Digicolor SoCs, rockchip
rk3288 board, asm9260 for MIPS and versatile AB/PB boards"
* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
dts: versatile: Add sysregs node
clocksource: versatile: Adapt for Versatile AB and PB boards
dt/bindings: Add binding for Versatile system registers
clocksource: Driver for Conexant Digicolor SoC timer
clocksource: devicetree: Document Conexant Digicolor timer binding
clockevents: rockchip: Add rockchip timer for rk3288
ARM: clocksource: Add asm9260_timer driver
clocksource: marco: Rename marco to atlas7
clocksource: sirf: Remove unused variable
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 348f5c16ef50..b663e3590bd4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -974,7 +974,7 @@ S: Maintained F: arch/arm/mach-prima2/ F: drivers/clk/sirf/ F: drivers/clocksource/timer-prima2.c -F: drivers/clocksource/timer-marco.c +F: drivers/clocksource/timer-atlas7.c N: [^a-z]sirf ARM/EBSA110 MACHINE SUPPORT |