Merge upstream into 'upstream' branch of netdev-2.6.git. (75a95178) · 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

75a95178

Commit 75a95178 authored 19 years ago by Jeff Garzik

Downloads
- Plain Diff

Merge upstream into 'upstream' branch of netdev-2.6.git.

Hand fix merge conflict in drivers/net/tokenring/Kconfig.

parents 8531c5ff 0572e3da

No related branches found

No related tags found

Loading

Changes 125

Hide whitespace changes

Inline Side-by-side

Showing

Makefile 1 addition, 1 deletion

Makefile
arch/alpha/Kconfig 1 addition, 1 deletion

arch/alpha/Kconfig
arch/alpha/kernel/smp.c 3 additions, 3 deletions

arch/alpha/kernel/smp.c
arch/alpha/oprofile/common.c 3 additions, 3 deletions

arch/alpha/oprofile/common.c
arch/arm/Kconfig 1 addition, 1 deletion

arch/arm/Kconfig
arch/arm/kernel/traps.c 1 addition, 1 deletion

arch/arm/kernel/traps.c
arch/arm/nwfpe/fpopcode.h 3 additions, 3 deletions

arch/arm/nwfpe/fpopcode.h
arch/i386/kernel/nmi.c 2 additions, 2 deletions

arch/i386/kernel/nmi.c
arch/i386/kernel/traps.c 6 additions, 4 deletions

arch/i386/kernel/traps.c
arch/ia64/hp/sim/boot/boot_head.S 1 addition, 1 deletion

arch/ia64/hp/sim/boot/boot_head.S
arch/ia64/sn/kernel/io_init.c 10 additions, 8 deletions

arch/ia64/sn/kernel/io_init.c
arch/m32r/Kconfig 2 additions, 1 deletion

arch/m32r/Kconfig
arch/m32r/Kconfig.debug 1 addition, 1 deletion

arch/m32r/Kconfig.debug
arch/m32r/kernel/setup_m32700ut.c 3 additions, 1 deletion

arch/m32r/kernel/setup_m32700ut.c
arch/m32r/kernel/setup_opsput.c 3 additions, 1 deletion

arch/m32r/kernel/setup_opsput.c
arch/m32r/kernel/smpboot.c 1 addition, 0 deletions

arch/m32r/kernel/smpboot.c
arch/m32r/lib/csum_partial_copy.c 1 addition, 0 deletions

arch/m32r/lib/csum_partial_copy.c
arch/m32r/mm/discontig.c 2 additions, 0 deletions

arch/m32r/mm/discontig.c
arch/ppc/Kconfig 4 additions, 1 deletion

arch/ppc/Kconfig
arch/ppc/platforms/4xx/Kconfig 10 additions, 4 deletions

arch/ppc/platforms/4xx/Kconfig

with 59 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