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

4b6ace7f

Commit 4b6ace7f authored 18 years ago by Jeff Garzik

Downloads
- Plain Diff

Merge branch 'master' into upstream

parents b5ed7639 427abfa2

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

Makefile 1 addition, 1 deletion

Makefile
arch/powerpc/mm/hash_native_64.c 2 additions, 2 deletions

arch/powerpc/mm/hash_native_64.c
block/cfq-iosched.c 3 additions, 8 deletions

block/cfq-iosched.c
drivers/cdrom/cdrom.c 4 additions, 2 deletions

drivers/cdrom/cdrom.c
drivers/net/sky2.c 6 additions, 1 deletion

drivers/net/sky2.c
fs/bio.c 3 additions, 2 deletions

fs/bio.c
fs/locks.c 2 additions, 0 deletions

fs/locks.c
include/asm-powerpc/cputable.h 1 addition, 1 deletion

include/asm-powerpc/cputable.h
kernel/exit.c 0 additions, 8 deletions

kernel/exit.c
kernel/posix-cpu-timers.c 22 additions, 26 deletions

kernel/posix-cpu-timers.c

with 44 additions and 51 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