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

2198a10b

Commit 2198a10b authored 14 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/core/dev.c

parents 9941fb62 db5a753b

No related branches found

No related tags found

Loading

Changes 192

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/vm/page-types.c 1 addition, 1 deletion

Documentation/vm/page-types.c
MAINTAINERS 21 additions, 3 deletions

MAINTAINERS
Makefile 2 additions, 2 deletions

Makefile
arch/arm/Kconfig 14 additions, 0 deletions

arch/arm/Kconfig
arch/arm/kernel/kprobes-decode.c 4 additions, 3 deletions

arch/arm/kernel/kprobes-decode.c
arch/arm/mach-at91/include/mach/system.h 3 additions, 4 deletions

arch/arm/mach-at91/include/mach/system.h
arch/arm/mach-ep93xx/dma-m2p.c 1 addition, 1 deletion

arch/arm/mach-ep93xx/dma-m2p.c
arch/arm/mach-imx/Kconfig 1 addition, 0 deletions

arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/mach-cpuimx27.c 1 addition, 1 deletion

arch/arm/mach-imx/mach-cpuimx27.c
arch/arm/mach-s5p6440/cpu.c 1 addition, 0 deletions

arch/arm/mach-s5p6440/cpu.c
arch/arm/mach-s5p6442/cpu.c 1 addition, 0 deletions

arch/arm/mach-s5p6442/cpu.c
arch/arm/mach-s5pc100/cpu.c 1 addition, 0 deletions

arch/arm/mach-s5pc100/cpu.c
arch/arm/mach-s5pv210/clock.c 0 additions, 5 deletions

arch/arm/mach-s5pv210/clock.c
arch/arm/mach-s5pv210/cpu.c 1 addition, 0 deletions

arch/arm/mach-s5pv210/cpu.c
arch/arm/mach-vexpress/ct-ca9x4.c 2 additions, 2 deletions

arch/arm/mach-vexpress/ct-ca9x4.c
arch/arm/mach-vexpress/v2m.c 1 addition, 1 deletion

arch/arm/mach-vexpress/v2m.c
arch/arm/mm/ioremap.c 6 additions, 2 deletions

arch/arm/mm/ioremap.c
arch/arm/mm/mmu.c 2 additions, 2 deletions

arch/arm/mm/mmu.c
arch/arm/mm/proc-v7.S 9 additions, 1 deletion

arch/arm/mm/proc-v7.S
arch/arm/plat-omap/iommu.c 1 addition, 0 deletions

arch/arm/plat-omap/iommu.c

with 73 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