Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

9e04099c

Commit 9e04099c authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents 757e0108 41489493

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

arch/arm/kernel/vmlinux.lds.S 8 additions, 7 deletions

arch/arm/kernel/vmlinux.lds.S
arch/arm/mach-l7200/core.c 15 additions, 5 deletions

arch/arm/mach-l7200/core.c
arch/arm/mach-pxa/corgi_lcd.c 19 additions, 1 deletion

arch/arm/mach-pxa/corgi_lcd.c
arch/arm/mach-pxa/generic.c 5 additions, 0 deletions

arch/arm/mach-pxa/generic.c
arch/arm/mach-pxa/spitz.c 1 addition, 3 deletions

arch/arm/mach-pxa/spitz.c
arch/arm/mach-s3c2410/Kconfig 1 addition, 0 deletions

arch/arm/mach-s3c2410/Kconfig
drivers/input/keyboard/spitzkbd.c 1 addition, 1 deletion

drivers/input/keyboard/spitzkbd.c
include/asm-arm/arch-pxa/pxafb.h 1 addition, 0 deletions

include/asm-arm/arch-pxa/pxafb.h
include/asm-arm/arch-s3c2410/io.h 42 additions, 16 deletions

include/asm-arm/arch-s3c2410/io.h

with 93 additions and 33 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