Merge branch 'parisc' of master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6 (62ae144f) · 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

62ae144f

Commit 62ae144f authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge branch 'parisc' of master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6

parents bcd039b2 2161558f

No related branches found

No related tags found

No related merge requests found

Changes 24

Hide whitespace changes

Inline Side-by-side

Showing

CREDITS 10 additions, 2 deletions

CREDITS
arch/parisc/kernel/drivers.c 6 additions, 2 deletions

arch/parisc/kernel/drivers.c
arch/parisc/kernel/entry.S 1 addition, 0 deletions

arch/parisc/kernel/entry.S
arch/parisc/kernel/inventory.c 1 addition, 1 deletion

arch/parisc/kernel/inventory.c
arch/parisc/kernel/ioctl32.c 0 additions, 546 deletions

arch/parisc/kernel/ioctl32.c
arch/parisc/kernel/irq.c 92 additions, 18 deletions

arch/parisc/kernel/irq.c
arch/parisc/kernel/perf.c 20 additions, 13 deletions

arch/parisc/kernel/perf.c
arch/parisc/kernel/ptrace.c 3 additions, 2 deletions

arch/parisc/kernel/ptrace.c
arch/parisc/kernel/signal.c 0 additions, 1 deletion

arch/parisc/kernel/signal.c
arch/parisc/kernel/smp.c 18 additions, 6 deletions

arch/parisc/kernel/smp.c
arch/parisc/kernel/syscall.S 2 additions, 1 deletion

arch/parisc/kernel/syscall.S
drivers/ide/Kconfig 1 addition, 1 deletion

drivers/ide/Kconfig
drivers/isdn/hisax/Kconfig 6 additions, 6 deletions

drivers/isdn/hisax/Kconfig
drivers/isdn/pcbit/Kconfig 1 addition, 1 deletion

drivers/isdn/pcbit/Kconfig
drivers/parisc/iosapic.c 25 additions, 1 deletion

drivers/parisc/iosapic.c
drivers/parisc/superio.c 21 additions, 14 deletions

drivers/parisc/superio.c
drivers/serial/Kconfig 1 addition, 1 deletion

drivers/serial/Kconfig
drivers/serial/mux.c 11 additions, 8 deletions

drivers/serial/mux.c
include/asm-parisc/irq.h 3 additions, 2 deletions

include/asm-parisc/irq.h
include/asm-parisc/smp.h 6 additions, 1 deletion

include/asm-parisc/smp.h

with 228 additions and 627 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