Merge branches 'timers/clocksource', 'timers/hrtimers', 'timers/nohz', 'timers/ntp...
authorThomas Gleixner <tglx@linutronix.de>
Mon, 20 Oct 2008 11:14:06 +0000 (13:14 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 20 Oct 2008 11:14:06 +0000 (13:14 +0200)
commitc465a76af658b443075d6efee1c3131257643020
tree63c28c9fab02dedec7f03cee4a3ef7fe4dc1c072
parent2d42244ae71d6c7b0884b5664cf2eda30fb2ae68
parent1b02469088ac7a13d7e622b618b7410d0f1ce5ec
parentfb02fbc14d17837b4b7b02dbb36142c16a7bf208
parentd40e944c25fb4642adb2a4c580a48218a9f3f824
parent1508487e7f16d992ad23cabd3712563ff912f413
parent322acf6585f3c4e82ee32a246b0483ca0f6ad3f4
Merge branches 'timers/clocksource', 'timers/hrtimers', 'timers/nohz', 'timers/ntp', 'timers/posixtimers' and 'timers/debug' into v28-timers-for-linus
20 files changed:
drivers/clocksource/acpi_pm.c
fs/binfmt_elf.c
fs/proc/array.c
include/linux/hrtimer.h
include/linux/sched.h
include/linux/time.h
kernel/compat.c
kernel/exit.c
kernel/fork.c
kernel/hrtimer.c
kernel/posix-timers.c
kernel/sched.c
kernel/sched_fair.c
kernel/sched_rt.c
kernel/softirq.c
kernel/sys.c
kernel/time/ntp.c
kernel/time/timekeeping.c
kernel/timer.c
security/selinux/hooks.c