diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 15:25:04 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 15:25:04 -0700 |
commit | f061d83a2b29f08b41c494335b7d23a432cb5a2d (patch) | |
tree | 4b3fe2797968491f1e18e5ef52a9d08b37a2c301 /kernel/ptrace.c | |
parent | e345fe1ada6f91bf703ca080168745ef18b2f037 (diff) | |
parent | e17b38bf9e70d74f3739a600db75240078ac1407 (diff) | |
download | linux-f061d83a2b29f08b41c494335b7d23a432cb5a2d.tar.bz2 |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Fix missing kernel-doc notation
Revert "x86, timers: Check for pending timers after (device) interrupts"
sched: Update the clock of runqueue select_task_rq() selected
Diffstat (limited to 'kernel/ptrace.c')
0 files changed, 0 insertions, 0 deletions