diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-04 20:25:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-04 20:25:31 +0200 |
| commit | c22072bdf053b115a1126658100967dda00b5ecf (patch) | |
| tree | 21520119dbbfce237a5005e9840105e86944c9cc /arch/arm/mach-mxs/Makefile | |
| parent | vfs: Fix /proc/<tid>/fdinfo/<fd> file handling (diff) | |
| parent | tick: Move skew_tick option into the HIGH_RES_TIMER section (diff) | |
| download | linux-c22072bdf053b115a1126658100967dda00b5ecf.tar.xz linux-c22072bdf053b115a1126658100967dda00b5ecf.zip | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer updates from Thomas Gleixner:
"The clocksource driver is pure hardware enablement and the skew option
is default off, well tested and non dangerous."
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tick: Move skew_tick option into the HIGH_RES_TIMER section
clocksource: em_sti: Add DT support
clocksource: em_sti: Emma Mobile STI driver
clockevents: Make clockevents_config() a global symbol
tick: Add tick skew boot option
Diffstat (limited to 'arch/arm/mach-mxs/Makefile')
0 files changed, 0 insertions, 0 deletions