Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

R

R128
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

2e3e80c2

Commit 2e3e80c2 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

parents 4e7c6816 fffcc150

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

MAINTAINERS 2 additions, 2 deletions

MAINTAINERS
arch/ia64/kernel/entry.S 2 additions, 2 deletions

arch/ia64/kernel/entry.S
arch/ia64/kernel/mca.c 2 additions, 2 deletions

arch/ia64/kernel/mca.c
arch/ia64/kernel/minstate.h 1 addition, 2 deletions

arch/ia64/kernel/minstate.h
arch/ia64/kernel/perfmon.c 160 additions, 15 deletions

arch/ia64/kernel/perfmon.c
arch/ia64/kernel/ptrace.c 17 additions, 3 deletions

arch/ia64/kernel/ptrace.c
arch/ia64/kernel/smpboot.c 1 addition, 1 deletion

arch/ia64/kernel/smpboot.c
arch/ia64/kernel/sys_ia64.c 0 additions, 7 deletions

arch/ia64/kernel/sys_ia64.c
arch/ia64/sn/kernel/setup.c 2 additions, 0 deletions

arch/ia64/sn/kernel/setup.c
include/asm-ia64/perfmon.h 8 additions, 0 deletions

include/asm-ia64/perfmon.h
include/asm-ia64/sn/sn_sal.h 27 additions, 1 deletion

include/asm-ia64/sn/sn_sal.h

with 222 additions and 35 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