Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

5ba1ae92

Commit 5ba1ae92 authored 16 years ago by Ingo Molnar

Downloads
- Plain Diff

Merge branches 'timers/clockevents', 'timers/hpet', 'timers/hrtimers' and...

Merge branches 'timers/clockevents', 'timers/hpet', 'timers/hrtimers' and 'timers/urgent' into timers/core

parents ae1a25da 2d68259d 42bb8cc5 6626bff2 ff08f76d

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

arch/x86/kernel/hpet.c 10 additions, 2 deletions

arch/x86/kernel/hpet.c
arch/x86/kernel/quirks.c 2 additions, 1 deletion

arch/x86/kernel/quirks.c
include/linux/init_task.h 5 additions, 6 deletions

include/linux/init_task.h
include/linux/sched.h 38 additions, 24 deletions

include/linux/sched.h
kernel/exit.c 3 additions, 0 deletions

kernel/exit.c
kernel/fork.c 2 additions, 1 deletion

kernel/fork.c
kernel/itimer.c 2 additions, 2 deletions

kernel/itimer.c
kernel/posix-cpu-timers.c 91 additions, 4 deletions

kernel/posix-cpu-timers.c
kernel/sched.c 11 additions, 6 deletions

kernel/sched.c
kernel/sched_stats.h 26 additions, 19 deletions

kernel/sched_stats.h
kernel/signal.c 4 additions, 4 deletions

kernel/signal.c
kernel/time/clockevents.c 11 additions, 9 deletions

kernel/time/clockevents.c

with 205 additions and 78 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment