]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c4bd822 592aa99)
Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2
authorThomas Gleixner <tglx@linutronix.de>
Wed, 22 Oct 2008 07:48:06 +0000 (09:48 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 22 Oct 2008 07:48:06 +0000 (09:48 +0200)
commit268a3dcfea2077fca60d3715caa5c96f9b5e6ea7
treec2232774508424e677e27f296090a68c775e4669tree | snapshot
parentc4bd822e7b12a9008241d76db45b665f2fef180ccommit | diff
parent592aa999d6a272856c9bfbdaac0cfba1bb37c24ccommit | diff
Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2

Conflicts:

kernel/time/tick-sched.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
include/linux/hrtimer.h diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
include/linux/time.h diff1 | diff2 | blob | history
kernel/fork.c diff1 | diff2 | blob | history
kernel/hrtimer.c diff1 | diff2 | blob | history
kernel/posix-timers.c diff1 | diff2 | blob | history
kernel/sched.c diff1 | diff2 | blob | history
kernel/sys.c diff1 | diff2 | blob | history
kernel/time/ntp.c diff1 | diff2 | blob | history
kernel/time/tick-sched.c diff1 | diff2 | blob | history
kernel/time/timer_list.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.