Merge branch 'pxa/devel' into next/devel2 (b8bc8397) · Commits · Clea OS / bsp / nxp / linux-seco-imx · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

linux-seco-imx
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Jira
- Terraform modules
- Model experiments

Snippets Groups Projects

b8bc8397

Commit b8bc8397 authored 13 years ago by Arnd Bergmann

Downloads
- Plain Diff

Merge branch 'pxa/devel' into next/devel2

Conflicts:
	arch/arm/mach-s3c2416/s3c2416.c

parents 11f0d931 bca7ab31

No related branches found

No related tags found

No related merge requests found

Changes 256

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/kernel-parameters.txt 4 additions, 3 deletions

Documentation/kernel-parameters.txt
Documentation/networking/ip-sysctl.txt 2 additions, 2 deletions

Documentation/networking/ip-sysctl.txt
Documentation/networking/scaling.txt 6 additions, 6 deletions

Documentation/networking/scaling.txt
MAINTAINERS 4 additions, 5 deletions

MAINTAINERS
Makefile 1 addition, 1 deletion

Makefile
arch/arm/Kconfig 1 addition, 0 deletions

arch/arm/Kconfig
arch/arm/common/vic.c 0 additions, 1 deletion

arch/arm/common/vic.c
arch/arm/include/asm/localtimer.h 2 additions, 0 deletions

arch/arm/include/asm/localtimer.h
arch/arm/kernel/perf_event_v7.c 2 additions, 2 deletions

arch/arm/kernel/perf_event_v7.c
arch/arm/mach-mmp/Makefile 1 addition, 1 deletion

arch/arm/mach-mmp/Makefile
arch/arm/mach-mmp/brownstone.c 11 additions, 0 deletions

arch/arm/mach-mmp/brownstone.c
arch/arm/mach-mmp/include/mach/mmp2.h 13 additions, 0 deletions

arch/arm/mach-mmp/include/mach/mmp2.h
arch/arm/mach-mmp/include/mach/sram.h 35 additions, 0 deletions

arch/arm/mach-mmp/include/mach/sram.h
arch/arm/mach-mmp/mmp2.c 3 additions, 0 deletions

arch/arm/mach-mmp/mmp2.c
arch/arm/mach-mmp/sram.c 168 additions, 0 deletions

arch/arm/mach-mmp/sram.c
arch/arm/mach-omap2/board-2430sdp.c 2 additions, 1 deletion

arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/hsmmc.c 4 additions, 8 deletions

arch/arm/mach-omap2/hsmmc.c
arch/arm/mach-omap2/usb-musb.c 0 additions, 3 deletions

arch/arm/mach-omap2/usb-musb.c
arch/arm/mach-s3c2410/s3c2410.c 2 additions, 0 deletions

arch/arm/mach-s3c2410/s3c2410.c
arch/arm/mach-s3c2412/s3c2412.c 2 additions, 0 deletions

arch/arm/mach-s3c2412/s3c2412.c

with 263 additions and 33 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