diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-11-27 11:47:10 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-11-27 11:47:38 +0100 |
| commit | 89de77a8c557f14d2713a1f43fbc33980e639b98 (patch) | |
| tree | 3d7f32120b6b155e3d1374b277a6333cdb9c31cc /drivers/thermal | |
| parent | cb2aa63469f81426c7406227be70b628b42f7a05 (diff) | |
| parent | 4a22d9c93af1f2b2c40354c4bc59fd007f33f05e (diff) | |
Merge branch 'clockevents/3.19' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core
Daniel Lezcano muttered:
* Marvell timer updates from Ezequiel Garcia
- Add missing clock enable calls for armada
- Change source clock for clocksource and watchdog
* SIRF timer updates from Yanchang Li
- Make clock rate configurable
Diffstat (limited to 'drivers/thermal')
0 files changed, 0 insertions, 0 deletions