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

f647a274

Commit f647a274 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

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

parents 75043cb5 2966207c

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

arch/arm/mach-ixp2000/core.c 67 additions, 18 deletions

arch/arm/mach-ixp2000/core.c
arch/arm/mach-ixp4xx/common.c 8 additions, 0 deletions

arch/arm/mach-ixp4xx/common.c
arch/arm/mm/proc-v6.S 3 additions, 3 deletions

arch/arm/mm/proc-v6.S
drivers/i2c/busses/i2c-ixp2000.c 2 additions, 1 deletion

drivers/i2c/busses/i2c-ixp2000.c
include/asm-arm/arch-ixp2000/gpio.h 12 additions, 19 deletions

include/asm-arm/arch-ixp2000/gpio.h
include/asm-arm/arch-ixp2000/io.h 74 additions, 2 deletions

include/asm-arm/arch-ixp2000/io.h
include/asm-arm/arch-ixp2000/platform.h 1 addition, 21 deletions

include/asm-arm/arch-ixp2000/platform.h
include/asm-arm/arch-ixp4xx/debug-macro.S 1 addition, 0 deletions

include/asm-arm/arch-ixp4xx/debug-macro.S
include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 10 additions, 0 deletions

include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
include/asm-arm/io.h 2 additions, 0 deletions

include/asm-arm/io.h

with 180 additions and 64 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