summaryrefslogtreecommitdiffstats
path: root/kernel/taskstats.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-26 11:29:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-03-26 11:29:35 -0700
commit8f404faa72f4e458e7bd81ac75ce55ae829e953d (patch)
tree46b70d6d86fc619343b4986160bda5e46b86bb18 /kernel/taskstats.c
parent729eb528c7e10a4828fece102872ec5255946f64 (diff)
parent06d8308c61e54346585b2691c13ee3f90cb6fb2f (diff)
downloadlinux-8f404faa72f4e458e7bd81ac75ce55ae829e953d.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt: NOHZ: reevaluate idle sleep length after add_timer_on() clocksource: revert: use init_timer_deferrable for clocksource_watchdog
Diffstat (limited to 'kernel/taskstats.c')
0 files changed, 0 insertions, 0 deletions