Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (f43a64c5) · Commits · SECO Northern Europe / Kernel / linux-guf · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

linux-guf
- Activity
- Members
- Labels
- Terraform modules
- Model experiments

Snippets Groups Projects

f43a64c5

Commit f43a64c5 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

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

parents 5c23804a f7ceba36

No related branches found

No related tags found

Loading

Changes 19

Hide whitespace changes

Inline Side-by-side

Showing

arch/sparc/kernel/systbls.S 2 additions, 2 deletions

arch/sparc/kernel/systbls.S
arch/sparc64/Kconfig 17 additions, 0 deletions

arch/sparc64/Kconfig
arch/sparc64/kernel/entry.S 14 additions, 28 deletions

arch/sparc64/kernel/entry.S
arch/sparc64/kernel/power.c 2 additions, 1 deletion

arch/sparc64/kernel/power.c
arch/sparc64/kernel/ptrace.c 34 additions, 12 deletions

arch/sparc64/kernel/ptrace.c
arch/sparc64/kernel/smp.c 5 additions, 5 deletions

arch/sparc64/kernel/smp.c
arch/sparc64/kernel/sparc64_ksyms.c 1 addition, 1 deletion

arch/sparc64/kernel/sparc64_ksyms.c
arch/sparc64/kernel/sys32.S 2 additions, 0 deletions

arch/sparc64/kernel/sys32.S
arch/sparc64/kernel/systbls.S 4 additions, 4 deletions

arch/sparc64/kernel/systbls.S
arch/sparc64/kernel/time.c 9 additions, 15 deletions

arch/sparc64/kernel/time.c
arch/sparc64/kernel/vmlinux.lds.S 2 additions, 0 deletions

arch/sparc64/kernel/vmlinux.lds.S
arch/sparc64/mm/fault.c 0 additions, 16 deletions

arch/sparc64/mm/fault.c
arch/sparc64/solaris/entry64.S 5 additions, 2 deletions

arch/sparc64/solaris/entry64.S
include/asm-sparc/unistd.h 2 additions, 2 deletions

include/asm-sparc/unistd.h
include/asm-sparc64/thread_info.h 7 additions, 4 deletions

include/asm-sparc64/thread_info.h
include/asm-sparc64/unistd.h 2 additions, 2 deletions

include/asm-sparc64/unistd.h
include/linux/audit.h 1 addition, 1 deletion

include/linux/audit.h
include/linux/cache.h 1 addition, 1 deletion

include/linux/cache.h
init/Kconfig 1 addition, 1 deletion

init/Kconfig

with 111 additions and 97 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