Merge master.kernel.org:/home/rmk/linux-2.6-arm (eb1b74e0) · Commits · CodeLinaro / qsdk / kvalo / ath · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ath
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

eb1b74e0

Commit eb1b74e0 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

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

parents 50f72b57 7dead80c

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

arch/arm/common/scoop.c 18 additions, 2 deletions

arch/arm/common/scoop.c
arch/arm/mach-pxa/corgi.c 1 addition, 0 deletions

arch/arm/mach-pxa/corgi.c
arch/arm/mach-sa1100/collie.c 3 additions, 3 deletions

arch/arm/mach-sa1100/collie.c
arch/arm/mm/alignment.c 10 additions, 1 deletion

arch/arm/mm/alignment.c
arch/arm/tools/mach-types 86 additions, 4 deletions

arch/arm/tools/mach-types
drivers/char/s3c2410-rtc.c 1 addition, 0 deletions

drivers/char/s3c2410-rtc.c
drivers/serial/imx.c 4 additions, 5 deletions

drivers/serial/imx.c
drivers/serial/s3c2410.c 3 additions, 0 deletions

drivers/serial/s3c2410.c
include/asm-arm/arch-imx/imx-regs.h 1 addition, 1 deletion

include/asm-arm/arch-imx/imx-regs.h
include/asm-arm/hardware/scoop.h 2 additions, 0 deletions

include/asm-arm/hardware/scoop.h

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