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

7c526e1f

Commit 7c526e1f authored 16 years ago by Ingo Molnar

Downloads
- Plain Diff

Merge branches 'timers/new-apis', 'timers/ntp' and 'timers/urgent' into timers/core

parents e8684605 74019224 a2a5ac86 37bebc70

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

arch/powerpc/platforms/cell/spufs/sched.c 1 addition, 1 deletion

arch/powerpc/platforms/cell/spufs/sched.c
drivers/infiniband/hw/ipath/ipath_driver.c 3 additions, 3 deletions

drivers/infiniband/hw/ipath/ipath_driver.c
include/linux/timer.h 2 additions, 20 deletions

include/linux/timer.h
include/linux/timex.h 1 addition, 1 deletion

include/linux/timex.h
kernel/posix-cpu-timers.c 2 additions, 1 deletion

kernel/posix-cpu-timers.c
kernel/relay.c 1 addition, 1 deletion

kernel/relay.c
kernel/time/ntp.c 274 additions, 170 deletions

kernel/time/ntp.c
kernel/timer.c 73 additions, 37 deletions

kernel/timer.c

with 357 additions and 234 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