Russell King 0003cedfc5 Merge nommu tree ...

Fix merge conflict in arch/arm/mm/proc-xscale.S

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

2006-03-25 22:08:55 +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

Linux-2.6.12-rc2

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

abort-macro.S

Linux-2.6.12-rc2

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

alignment.c

[ARM] 2969/1: miscellaneous whitespace cleanup

2005-10-12 19:58:10 +01:00

cache-v3.S

Linux-2.6.12-rc2

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

cache-v4.S

Linux-2.6.12-rc2

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

cache-v4wb.S

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07: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

[PATCH] mm: split highorder pages

2006-03-22 07:53:57 -08:00

copypage-v3.S

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

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

copypage-v4mc.c

[PATCH] ARM: Fix build error

2005-05-16 23:36:22 +01: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] Make v6 copypage function static and cleanup pgprots

2005-10-30 19:03:21 +00:00

copypage-xscale.c

[PATCH] ARM: Fix Xscale copy_page implementation

2005-06-08 15:28:24 +01: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

[PATCH] mm: arm ready for split ptlock

2005-10-29 21:40:42 -07:00

fault.c

[ARM] Prevent deadlock in page fault handler

2005-09-20 17:52:13 +01:00

fault.h

Linux-2.6.12-rc2

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

flush.c

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

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

init.c

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

2006-03-22 17:32:09 -08:00

ioremap.c

[ARM] Remove unnecessary asm/hardware.h includes

2006-03-21 22:05:50 +00:00

Kconfig

Merge nommu tree

2006-03-25 22:08:55 +00:00

Makefile

[ARM] 3168/1: Update ARM signal delivery and masking

2005-11-19 10:01:07 +00:00

mm-armv.c

[ARM] 3269/1: Add ARMv6 MT_NONSHARED_DEVICE mem_types[] index

2006-01-26 15:21:28 +00:00

mmap.c

[PATCH] Avoiding mmap fragmentation

2005-06-21 18:46:16 -07:00

mmu.c

Linux-2.6.12-rc2

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

proc-arm6_7.S

[ARM] nommu: Move hardware page table definitions to pgtable-hwdef.h

2006-03-21 22:03:25 +00:00

proc-arm720.S

Merge nommu tree

2006-03-25 22:08:55 +00:00

proc-arm920.S

Merge nommu tree

2006-03-25 22:08:55 +00:00

proc-arm922.S

Merge nommu tree

2006-03-25 22:08:55 +00:00

proc-arm925.S

Merge nommu tree

2006-03-25 22:08:55 +00:00

proc-arm926.S

Merge nommu tree

2006-03-25 22:08:55 +00:00

proc-arm1020.S

Merge nommu tree

2006-03-25 22:08:55 +00:00

proc-arm1020e.S

Merge nommu tree

2006-03-25 22:08:55 +00:00

proc-arm1022.S

[ARM] nommu: Move hardware page table definitions to pgtable-hwdef.h

2006-03-21 22:03:25 +00:00

proc-arm1026.S

[ARM] nommu: Move hardware page table definitions to pgtable-hwdef.h

2006-03-21 22:03:25 +00:00

proc-macros.S

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

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

proc-sa110.S

[ARM] nommu: Move hardware page table definitions to pgtable-hwdef.h

2006-03-21 22:03:25 +00:00

proc-sa1100.S

[ARM] nommu: Move hardware page table definitions to pgtable-hwdef.h

2006-03-21 22:03:25 +00:00

proc-syms.c

Linux-2.6.12-rc2

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

proc-v6.S

[ARM] nommu: Move hardware page table definitions to pgtable-hwdef.h

2006-03-21 22:03:25 +00:00

proc-xscale.S

Merge nommu tree

2006-03-25 22:08:55 +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] 3352/1: DSB required for the completion of a TLB maintenance operation

2006-03-07 14:42:27 +00:00