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 /drivers/gpu/drm/nouveau/core/engine/disp/sornv94.c | |
| parent | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | Merge branch 'clockevents/3.20' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core (diff) | |
| download | linux-dev-8c334ce8f0fec7122fc3059c52a697b669a01b41.tar.xz linux-dev-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 'drivers/gpu/drm/nouveau/core/engine/disp/sornv94.c')
0 files changed, 0 insertions, 0 deletions