summaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-09 19:35:30 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-09 19:35:30 +0200
commit422a253483aa5de71a2bcdc27b0aa023053f97f8 (patch)
tree3e25aaf65b8eaf275bb01982a89fb0cd631c4367 /kernel/timer.c
parentMN10300: Convert obsolete no_irq_type to no_irq_chip (diff)
parentprintk: fix wrong format string iter for printk (diff)
parentirq: fix cpumask memory leak on offstack cpumask kernels (diff)
parentposix-timers: fix RLIMIT_CPU && setitimer(CPUCLOCK_PROF) (diff)
downloadlinux-422a253483aa5de71a2bcdc27b0aa023053f97f8.tar.xz
linux-422a253483aa5de71a2bcdc27b0aa023053f97f8.zip
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