Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

R

R128
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

a9da4f7e

Commit a9da4f7e authored 16 years ago by Russell King Committed by Russell King 16 years ago

Downloads
- Plain Diff

Merge branches 'pxa-ian' and 'pxa-xm270' into pxa

Conflicts:

	MAINTAINERS

parents 67f5cd0f 13f75582 03fe6692

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

MAINTAINERS 17 additions, 11 deletions

MAINTAINERS
arch/arm/common/sa1111.c 1 addition, 1 deletion

arch/arm/common/sa1111.c
arch/arm/mach-pxa/clock.c 0 additions, 30 deletions

arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/clock.h 9 additions, 0 deletions

arch/arm/mach-pxa/clock.h
arch/arm/mach-pxa/cm-x270-pci.c 14 additions, 13 deletions

arch/arm/mach-pxa/cm-x270-pci.c
arch/arm/mach-pxa/cm-x270-pci.h 7 additions, 7 deletions

arch/arm/mach-pxa/cm-x270-pci.h
arch/arm/mach-pxa/cm-x270.c 285 additions, 118 deletions

arch/arm/mach-pxa/cm-x270.c
arch/arm/mach-pxa/em-x270.c 292 additions, 79 deletions

arch/arm/mach-pxa/em-x270.c
arch/arm/mach-pxa/pxa25x.c 55 additions, 4 deletions

arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-sa1100/clock.c 1 addition, 1 deletion

arch/arm/mach-sa1100/clock.c
drivers/mtd/nand/cmx270_nand.c 47 additions, 32 deletions

drivers/mtd/nand/cmx270_nand.c
drivers/pcmcia/pxa2xx_cm_x270.c 27 additions, 66 deletions

drivers/pcmcia/pxa2xx_cm_x270.c
include/asm-arm/arch-pxa/cm-x270.h 0 additions, 50 deletions

include/asm-arm/arch-pxa/cm-x270.h
include/asm-arm/arch-pxa/hardware.h 12 additions, 0 deletions

include/asm-arm/arch-pxa/hardware.h

with 767 additions and 412 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