diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-09 11:20:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-09 11:20:36 +0100 |
| commit | f40d149b58f5dea148ceaee5f9249da133e5004c (patch) | |
| tree | 413b03df98cb9b2d8e877481dfd0795a89dedc7d /MAINTAINERS | |
| parent | 4ebbda5251374d532ba8939de4241d769d1420b6 (diff) | |
| parent | 35a8578e8b83eb13f8d57ab40b98bcfd5199d3d4 (diff) | |
| download | linux-f40d149b58f5dea148ceaee5f9249da133e5004c.tar.bz2 | |
Merge branch 'clockevents/3.20' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevents updates from Daniel Lezcano:
- Add new driver for the Conexant Digicolor SoCs (Baruch Siach)
- Add new driver for the rockchip rk3288 board (Daniel Lezcano)
- Add new asm9260 driver for MIPS (Oleksij Rempel)
- Add DT definitions for the versatile AB/PB boards (Rob Herring)
- Rename the 'marco' timer to 'atlas7' (Barry Song)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2fa385321245..f6923cf22d3f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -958,7 +958,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 |