summaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-09 10:35:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-09 10:35:30 -0700
commit422a253483aa5de71a2bcdc27b0aa023053f97f8 (patch)
tree3e25aaf65b8eaf275bb01982a89fb0cd631c4367 /kernel/timer.c
parent91e58b6e95a9c6b9efd928ae352eae5e75ae598c (diff)
parent022624a758dc9489388a99ad29577b4c8c09237c (diff)
parent9756b15e1b58453a6fd54b85c1ad8515209e10bb (diff)
parent8f2e586567b1bad72dac7c3810fe9a2ef7117506 (diff)
downloadlinux-422a253483aa5de71a2bcdc27b0aa023053f97f8.tar.bz2
Merge branches 'core-fixes-for-linus', 'irq-fixes-for-linus' and 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: printk: fix wrong format string iter for printk futex: comment requeue key reference semantics * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: irq: fix cpumask memory leak on offstack cpumask kernels * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: posix-timers: fix RLIMIT_CPU && setitimer(CPUCLOCK_PROF) posix-timers: fix RLIMIT_CPU && fork() timers: add missing kernel-doc