Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

KED Linux Kernel Fork
- Activity
- Members
- Labels
- Model registry
- Model experiments

Snippets Groups Projects

9759d22c

Commit 9759d22c authored 16 years ago by Russell King Committed by Russell King 16 years ago

Downloads
- Plain Diff

Merge branch 'master' into devel

Conflicts:
	arch/arm/include/asm/elf.h
	arch/arm/kernel/module.c

parents ed40d0c4 f0bba9f9

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

arch/arm/include/asm/elf.h 1 addition, 0 deletions

arch/arm/include/asm/elf.h
arch/arm/kernel/module.c 9 additions, 0 deletions

arch/arm/kernel/module.c
arch/arm/mach-iop13xx/pci.c 4 additions, 1 deletion

arch/arm/mach-iop13xx/pci.c
arch/arm/mm/mmu.c 1 addition, 1 deletion

arch/arm/mm/mmu.c
drivers/scsi/arm/cumana_2.c 1 addition, 1 deletion

drivers/scsi/arm/cumana_2.c

with 16 additions and 3 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