Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 (1604d9c8) · Commits · Martyn Welch / linux · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

1604d9c8

Commit 1604d9c8 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

parents a8400986 3b5cc090

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/kernel-parameters.txt 3 additions, 0 deletions

Documentation/kernel-parameters.txt
arch/ia64/hp/sim/simeth.c 4 additions, 2 deletions

arch/ia64/hp/sim/simeth.c
arch/ia64/hp/sim/simserial.c 5 additions, 2 deletions

arch/ia64/hp/sim/simserial.c
arch/ia64/kernel/entry.S 1 addition, 1 deletion

arch/ia64/kernel/entry.S
arch/ia64/kernel/iosapic.c 9 additions, 4 deletions

arch/ia64/kernel/iosapic.c
arch/ia64/kernel/irq_ia64.c 2 additions, 13 deletions

arch/ia64/kernel/irq_ia64.c
arch/ia64/kernel/perfmon.c 0 additions, 1 deletion

arch/ia64/kernel/perfmon.c
arch/ia64/sn/kernel/tiocx.c 0 additions, 1 deletion

arch/ia64/sn/kernel/tiocx.c
arch/ia64/sn/kernel/xpc_main.c 5 additions, 11 deletions

arch/ia64/sn/kernel/xpc_main.c
include/asm-ia64/hw_irq.h 0 additions, 1 deletion

include/asm-ia64/hw_irq.h
include/asm-ia64/sn/xp.h 0 additions, 1 deletion

include/asm-ia64/sn/xp.h

with 29 additions and 37 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