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: (34 commits) time: Prevent 32 bit overflow with set_normalized_timespec() clocksource: Delay clocksource down rating to late boot clocksource: clocksource_select must be called with mutex locked clocksource: Resolve cpu hotplug dead lock with TSC unstable, fix crash timers: Drop a function prototype clocksource: Resolve cpu hotplug dead lock with TSC unstable timer.c: Fix S/390 comments timekeeping: Fix invalid getboottime() value timekeeping: Fix up read_persistent_clock() breakage on sh timekeeping: Increase granularity of read_persistent_clock(), build fix time: Introduce CLOCK_REALTIME_COARSE x86: Do not unregister PIT clocksource on PIT oneshot setup/shutdown clocksource: Avoid clocksource watchdog circular locking dependency clocksource: Protect the watchdog rating changes with clocksource_mutex clocksource: Call clocksource_change_rating() outside of watchdog_lock timekeeping: Introduce read_boot_clock timekeeping: Increase granularity of read_persistent_clock() timekeeping: Update clocksource with stop_machine timekeeping: Add timekeeper read_clock helper functions timekeeping: Move NTP adjusted clock multiplier to struct timekeeper ... Fix trivial conflict due to MIPS lemote -> loongson renaming.
No related branches found
No related tags found
Showing
- arch/arm/plat-omap/common.c 2 additions, 5 deletionsarch/arm/plat-omap/common.c
- arch/m68knommu/kernel/time.c 3 additions, 2 deletionsarch/m68knommu/kernel/time.c
- arch/mips/dec/time.c 3 additions, 2 deletionsarch/mips/dec/time.c
- arch/mips/lasat/ds1603.c 3 additions, 2 deletionsarch/mips/lasat/ds1603.c
- arch/mips/lasat/sysctl.c 6 additions, 2 deletionsarch/mips/lasat/sysctl.c
- arch/mips/loongson/common/time.c 3 additions, 2 deletionsarch/mips/loongson/common/time.c
- arch/mips/mti-malta/malta-time.c 3 additions, 2 deletionsarch/mips/mti-malta/malta-time.c
- arch/mips/pmc-sierra/yosemite/setup.c 3 additions, 2 deletionsarch/mips/pmc-sierra/yosemite/setup.c
- arch/mips/sibyte/swarm/setup.c 11 additions, 4 deletionsarch/mips/sibyte/swarm/setup.c
- arch/mips/sni/time.c 3 additions, 2 deletionsarch/mips/sni/time.c
- arch/powerpc/kernel/time.c 12 additions, 7 deletionsarch/powerpc/kernel/time.c
- arch/s390/kernel/time.c 10 additions, 28 deletionsarch/s390/kernel/time.c
- arch/sh/kernel/time.c 2 additions, 4 deletionsarch/sh/kernel/time.c
- arch/x86/include/asm/vgtod.h 1 addition, 0 deletionsarch/x86/include/asm/vgtod.h
- arch/x86/kernel/i8253.c 0 additions, 19 deletionsarch/x86/kernel/i8253.c
- arch/x86/kernel/rtc.c 3 additions, 2 deletionsarch/x86/kernel/rtc.c
- arch/x86/kernel/tsc.c 11 additions, 3 deletionsarch/x86/kernel/tsc.c
- arch/x86/kernel/vsyscall_64.c 1 addition, 0 deletionsarch/x86/kernel/vsyscall_64.c
- arch/x86/vdso/vclock_gettime.c 36 additions, 3 deletionsarch/x86/vdso/vclock_gettime.c
- arch/xtensa/kernel/time.c 2 additions, 3 deletionsarch/xtensa/kernel/time.c
Loading
Please register or sign in to comment