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

..

acpi

…

asm-alpha

…

asm-arm

Merge nommu tree

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

asm-arm26

…

asm-cris

…

asm-frv

…

asm-generic

[PATCH] add EXPORT_SYMBOL_GPL_FUTURE()

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

asm-h8300

…

asm-i386

[PATCH] Enable mprotect on huge pages

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

asm-ia64

[PATCH] hugepage: is_aligned_hugepage_range() cleanup

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

asm-m32r

…

asm-m68k

…

asm-m68knommu

…

asm-mips

It's UTF-8

2006-03-22 00:13:35 +01:00

asm-parisc

…

asm-powerpc

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

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

asm-ppc

…

asm-s390

[PATCH] mm: remove set_pgdir leftovers

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

asm-sh

…

asm-sh64

[PATCH] mm: remove set_pgdir leftovers

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

asm-sparc

[SPARC]: Respect vm_page_prot in io_remap_page_range().

2006-03-22 01:15:13 -08:00

asm-sparc64

[SPARC64]: Add a secondary TSB for hugepage mappings.

2006-03-22 01:15:14 -08:00

asm-um

…

asm-v850

…

asm-x86_64

[PATCH] Enable mprotect on huge pages

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

asm-xtensa

…

keys

…

linux

include/linux/clk.h is betraying its ARM origins

2006-03-25 18:15:24 +00:00

math-emu

…

media

V4L/DVB (3513): Remove saa711x driver

2006-03-21 08:53:40 -08:00

mtd

…

net

[NETFILTER]: futher {ip,ip6,arp}_tables unification

2006-03-22 13:56:56 -08:00

pcmcia

…

rdma

IB/umad: Add support for large RMPP transfers

2006-03-20 10:08:23 -08:00

rxrpc

…

scsi

Merge ../linux-2.6

2006-03-21 13:05:45 -06:00

sound

[ALSA] version 1.0.11rc4

2006-03-22 14:37:15 +01:00

video

…