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

b54a063d

Commit b54a063d authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

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

parents 085f20e4 15559722

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/arm/README 3 additions, 4 deletions

Documentation/arm/README
MAINTAINERS 5 additions, 0 deletions

MAINTAINERS
arch/arm/kernel/entry-armv.S 7 additions, 8 deletions

arch/arm/kernel/entry-armv.S
arch/arm/kernel/setup.c 8 additions, 2 deletions

arch/arm/kernel/setup.c
arch/arm/mach-ixp2000/uengine.c 5 additions, 6 deletions

arch/arm/mach-ixp2000/uengine.c
arch/arm/mach-ixp4xx/common-pci.c 1 addition, 1 deletion

arch/arm/mach-ixp4xx/common-pci.c
arch/arm/mach-pxa/Kconfig 7 additions, 2 deletions

arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/Makefile 1 addition, 0 deletions

arch/arm/mach-pxa/Makefile
arch/arm/mach-pxa/pm.c 12 additions, 4 deletions

arch/arm/mach-pxa/pm.c
arch/arm/mach-pxa/tosa.c 162 additions, 0 deletions

arch/arm/mach-pxa/tosa.c
include/asm-arm/arch-iop3xx/iop331.h 1 addition, 1 deletion

include/asm-arm/arch-iop3xx/iop331.h
include/asm-arm/arch-pxa/pm.h 12 additions, 0 deletions

include/asm-arm/arch-pxa/pm.h
include/asm-arm/arch-pxa/tosa.h 166 additions, 0 deletions

include/asm-arm/arch-pxa/tosa.h
include/asm-arm/mmu_context.h 1 addition, 0 deletions

include/asm-arm/mmu_context.h

with 391 additions and 28 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