Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: posix-timers.c: Don't export local functions clocksource: start CMT at clocksource resume clocksource: add suspend callback clocksource: add argument to resume callback ntp: Cleanup xtime references in ntp.c ntp: Make time_esterror and time_maxerror static
No related branches found
No related tags found
Showing
- arch/ia64/kernel/time.c 1 addition, 1 deletionarch/ia64/kernel/time.c
- arch/x86/kernel/hpet.c 1 addition, 1 deletionarch/x86/kernel/hpet.c
- arch/x86/kernel/tsc.c 1 addition, 1 deletionarch/x86/kernel/tsc.c
- drivers/clocksource/sh_cmt.c 7 additions, 28 deletionsdrivers/clocksource/sh_cmt.c
- include/linux/clocksource.h 4 additions, 1 deletioninclude/linux/clocksource.h
- include/linux/timex.h 0 additions, 3 deletionsinclude/linux/timex.h
- kernel/posix-timers.c 1 addition, 1 deletionkernel/posix-timers.c
- kernel/time/clocksource.c 13 additions, 1 deletionkernel/time/clocksource.c
- kernel/time/ntp.c 5 additions, 5 deletionskernel/time/ntp.c
- kernel/time/timekeeping.c 1 addition, 0 deletionskernel/time/timekeeping.c
Loading
Please register or sign in to comment