Russell King 8213084125 Merge NetSilicon NS93xx tree ...

Fixed conflicts:

	arch/arm/Makefile
	arch/arm/mm/Kconfig

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2007-02-18 11:27:07 +00:00

..

abort-ev4.S

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

abort-ev4t.S

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

abort-ev5t.S

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

abort-ev5tj.S

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

abort-ev6.S

[ARM] CONFIG_CPU_MPCORE -> CONFIG_CPU_32v6K

2006-02-22 21:13:28 +00:00

abort-lv4t.S

[ARM] nommu: abort handler fixup for !CPU_CP15_MMU cores.

2006-09-28 20:15:46 +01:00

abort-macro.S

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

abort-nommu.S

[ARM] nommu: abort handler fixup for !CPU_CP15_MMU cores.

2006-09-28 20:15:46 +01:00

alignment.c

[ARM] do_bad_area() always takes current and current->active_mm

2006-09-27 16:13:48 +01:00

cache-l2x0.c

[ARM] 4135/1: Add support for the L210/L220 cache controllers

2007-02-11 16:48:02 +00:00

cache-v3.S

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cache-v4.S

[ARM] nommu: manage the CP15 things

2006-09-27 17:34:30 +01:00

cache-v4wb.S

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

cache-v4wt.S

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cache-v6.S

[ARM] 3356/1: Workaround for the ARM1136 I-cache invalidation problem

2006-03-10 22:26:47 +00:00

consistent.c

[ARM] 4153/1: fix consistent_sync() off-by-one BUG check

2007-02-08 15:29:00 +00:00

context.c

[ARM] 4128/1: Architecture compliant TTBR changing sequence

2007-02-08 14:49:24 +00:00

copypage-v3.S

[ARM] Remove LOADREGS macro

2006-06-25 11:23:45 +01:00

copypage-v4mc.c

[ARM] 4078/1: Fix ARM copypage cache coherency problems

2006-12-30 17:05:08 +00:00

copypage-v4wb.S

kbuild: arm - use generic asm-offsets.h support

2005-09-09 21:08:59 +02:00

copypage-v4wt.S

kbuild: arm - use generic asm-offsets.h support

2005-09-09 21:08:59 +02:00

copypage-v6.c

[ARM] 4078/1: Fix ARM copypage cache coherency problems

2006-12-30 17:05:08 +00:00

copypage-xsc3.S

[ARM] 3377/2: add support for intel xsc3 core

2006-03-28 21:00:40 +01:00

copypage-xscale.c

[ARM] 4078/1: Fix ARM copypage cache coherency problems

2006-12-30 17:05:08 +00:00

discontig.c

[ARM] Cleanup ARM includes

2006-01-03 17:39:34 +00:00

extable.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

fault-armv.c

[ARM] 4191/1: Remove redundant __flush_dcache_page() function prototype

2007-02-16 12:57:55 +00:00

fault.c

[PATCH] mm: arch do_page_fault() vs in_atomic()

2006-12-07 08:39:21 -08:00

fault.h

[ARM] do_bad_area() always takes current and current->active_mm

2006-09-27 16:13:48 +01:00

flush.c

[ARM] Resolve fuse and direct-IO failures due to missing cache flushes

2007-01-08 19:49:58 +00:00

init.c

[ARM] Fix show_mem() for discontigmem

2007-01-24 11:59:56 +00:00

iomap.c

[ARM] nommu: add stubs for ioremap and friends

2006-06-28 17:59:48 +01:00

ioremap.c

[ARM] 4112/1: Only ioremap to supersections if DOMAIN_IO is zero

2007-01-25 16:35:26 +00:00

Kconfig

Merge NetSilicon NS93xx tree

2007-02-18 11:27:07 +00:00

Makefile

[ARM] 4135/1: Add support for the L210/L220 cache controllers

2007-02-11 16:48:02 +00:00

mm.h

[ARM] Fix nommu build

2006-11-30 13:53:54 +00:00

mmap.c

[ARM] 3813/1: prevent >= 4G /dev/mem mmap()

2006-09-25 10:25:26 +01:00

mmu.c

[ARM] 4158/1: Fix user page protection macros

2007-02-11 17:06:17 +00:00

nommu.c

[ARM] Fix nommu build

2006-11-30 13:53:54 +00:00

pgd.c

[ARM] Unuse another Linux PTE bit

2006-12-13 14:34:43 +00:00

proc-arm6_7.S

[ARM] Unuse another Linux PTE bit

2006-12-13 14:34:43 +00:00

proc-arm7tdmi.S

[ARM] Include asm/elf.h instead of asm/procinfo.h

2006-11-30 12:24:46 +00:00

proc-arm9tdmi.S

[ARM] Include asm/elf.h instead of asm/procinfo.h

2006-11-30 12:24:46 +00:00

proc-arm720.S

[ARM] Unuse another Linux PTE bit

2006-12-13 14:34:43 +00:00

proc-arm740.S

[ARM] Include asm/elf.h instead of asm/procinfo.h

2006-11-30 12:24:46 +00:00

proc-arm920.S

[ARM] Unuse another Linux PTE bit

2006-12-13 14:34:43 +00:00

proc-arm922.S

[ARM] Unuse another Linux PTE bit

2006-12-13 14:34:43 +00:00

proc-arm925.S

[ARM] Unuse another Linux PTE bit

2006-12-13 14:34:43 +00:00

proc-arm926.S

[ARM] Unuse another Linux PTE bit

2006-12-13 14:34:43 +00:00

proc-arm940.S

[ARM] Include asm/elf.h instead of asm/procinfo.h

2006-11-30 12:24:46 +00:00

proc-arm946.S

[ARM] Include asm/elf.h instead of asm/procinfo.h

2006-11-30 12:24:46 +00:00

proc-arm1020.S

[ARM] Unuse another Linux PTE bit

2006-12-13 14:34:43 +00:00

proc-arm1020e.S

[ARM] Unuse another Linux PTE bit

2006-12-13 14:34:43 +00:00

proc-arm1022.S

[ARM] Unuse another Linux PTE bit

2006-12-13 14:34:43 +00:00

proc-arm1026.S

[ARM] Unuse another Linux PTE bit

2006-12-13 14:34:43 +00:00

proc-macros.S

[ARM] nommu: provide a way for correct control register value selection

2006-06-29 15:09:57 +01:00

proc-sa110.S

[ARM] Unuse another Linux PTE bit

2006-12-13 14:34:43 +00:00

proc-sa1100.S

[ARM] Unuse another Linux PTE bit

2006-12-13 14:34:43 +00:00

proc-syms.c

[ARM] Unuse another Linux PTE bit

2006-12-13 14:34:43 +00:00

proc-v6.S

Merge Realview GIC code

2007-02-15 15:07:40 +00:00

proc-xsc3.S

[ARM] 4123/1: xsc3: general cleanup

2007-02-08 14:48:44 +00:00

proc-xscale.S

[ARM] 4100/1: iop3xx: fix cpu mask for iop333

2007-01-24 11:59:57 +00:00

tlb-v3.S

kbuild: arm - use generic asm-offsets.h support

2005-09-09 21:08:59 +02:00

tlb-v4.S

kbuild: arm - use generic asm-offsets.h support

2005-09-09 21:08:59 +02:00

tlb-v4wb.S

kbuild: arm - use generic asm-offsets.h support

2005-09-09 21:08:59 +02:00

tlb-v4wbi.S

kbuild: arm - use generic asm-offsets.h support

2005-09-09 21:08:59 +02:00

tlb-v6.S

[ARM] 4129/1: Add barriers after the TLB operations

2007-02-08 14:49:27 +00:00