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

..

alpha

[PATCH] remove set_page_count() outside mm/

2006-03-22 07:54:02 -08:00

arm

Merge nommu tree

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

arm26

[PATCH] remove set_page_count() outside mm/

2006-03-22 07:54:02 -08:00

cris

[PATCH] remove set_page_count() outside mm/

2006-03-22 07:54:02 -08:00

frv

[PATCH] remove set_page_count() outside mm/

2006-03-22 07:54:02 -08:00

h8300

[PATCH] remove set_page_count() outside mm/

2006-03-22 07:54:02 -08:00

i386

[PATCH] hugepage: is_aligned_hugepage_range() cleanup

2006-03-22 07:54:04 -08:00

ia64

[PATCH] hugepage: is_aligned_hugepage_range() cleanup

2006-03-22 07:54:04 -08:00

m32r

[PATCH] remove set_page_count() outside mm/

2006-03-22 07:54:02 -08:00

m68k

[PATCH] remove set_page_count() outside mm/

2006-03-22 07:54:02 -08:00

m68knommu

[PATCH] remove set_page_count() outside mm/

2006-03-22 07:54:02 -08:00

mips

[PATCH] remove set_page_count() outside mm/

2006-03-22 07:54:02 -08:00

parisc

[PATCH] remove set_page_count() outside mm/

2006-03-22 07:54:02 -08:00

powerpc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

2006-03-22 22:20:46 -08:00

ppc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

2006-03-22 22:20:46 -08:00

s390

[PATCH] remove set_page_count() outside mm/

2006-03-22 07:54:02 -08:00

sh

[PATCH] hugepage: is_aligned_hugepage_range() cleanup

2006-03-22 07:54:04 -08:00

sh64

[PATCH] hugepage: is_aligned_hugepage_range() cleanup

2006-03-22 07:54:04 -08:00

sparc

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

2006-03-22 10:56:57 -08:00

sparc64

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

2006-03-22 10:56:57 -08:00

um

[PATCH] remove set_page_count() outside mm/

2006-03-22 07:54:02 -08:00

v850

[PATCH] add EXPORT_SYMBOL_GPL_FUTURE()

2006-03-20 13:42:58 -08:00

x86_64

[PATCH] remove set_page_count() outside mm/

2006-03-22 07:54:02 -08:00

xtensa

[PATCH] remove set_page_count() outside mm/

2006-03-22 07:54:02 -08:00