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

1e231efe

Commit 1e231efe authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

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

parents ef88b7db 0ce7625f

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

arch/arm/common/scoop.c 6 additions, 0 deletions

arch/arm/common/scoop.c
arch/arm/mach-pxa/corgi.c 12 additions, 0 deletions

arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/poodle.c 12 additions, 0 deletions

arch/arm/mach-pxa/poodle.c
arch/arm/mach-s3c2410/mach-n30.c 10 additions, 20 deletions

arch/arm/mach-s3c2410/mach-n30.c
drivers/pcmcia/pxa2xx_sharpsl.c 62 additions, 52 deletions

drivers/pcmcia/pxa2xx_sharpsl.c
include/asm-arm/hardware/scoop.h 13 additions, 0 deletions

include/asm-arm/hardware/scoop.h
include/asm-arm/mach/time.h 0 additions, 2 deletions

include/asm-arm/mach/time.h

with 115 additions and 74 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