Dmitry Torokhov 95d465fd75 Manual merge with Linus. ... Conflicts: arch/powerpc/kernel/setup-common.c drivers/input/keyboard/hil_kbd.c drivers/input/mouse/hil_ptr.c		2006-04-02 00:08:05 -05:00
..
acpi
asm-alpha	[PATCH] alpha: make poll flags the same as other architectures	2006-03-28 09:16:02 -08:00
asm-arm	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2006-03-31 21:33:07 -08:00
asm-arm26
asm-cris
asm-frv
asm-generic	[PATCH] mutex: some cleanups	2006-03-31 12:19:01 -08:00
asm-h8300
asm-i386	[PATCH] make local_t signed	2006-03-31 12:18:55 -08:00
asm-ia64	[IA64] Avoid "u64 foo : 32;" for gcc3 vs. gcc4 compatibility	2006-03-31 10:28:29 -08:00
asm-m32r
asm-m68k
asm-m68knommu
asm-mips	Merge master.kernel.org:/home/rmk/linux-2.6-serial	2006-03-28 13:52:37 -08:00
asm-parisc	[PARISC] Add atomic_sub_and_test	2006-03-30 17:48:59 +00:00
asm-powerpc	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2006-03-31 12:52:30 -08:00
asm-ppc	[PATCH] lock PTE before updating it in 440/BookE page fault handler	2006-03-29 13:44:15 +11:00
asm-s390	[PATCH] for_each_possible_cpu: s390	2006-03-31 12:18:52 -08:00
asm-sh	[PATCH] Typo fixes	2006-03-28 09:16:08 -08:00
asm-sh64
asm-sparc
asm-sparc64	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6	2006-03-28 09:25:22 -08:00
asm-um	[PATCH] uml: check for differences in host support	2006-03-31 12:18:52 -08:00
asm-v850
asm-x86_64	[PATCH] make local_t signed	2006-03-31 12:18:55 -08:00
asm-xtensa
keys
linux	Manual merge with Linus.	2006-04-02 00:08:05 -05:00
math-emu
media
mtd
net	[TCP]: Kill unused extern decl for tcp_v4_hash_connecting()	2006-03-31 02:25:46 -08:00
pcmcia
rdma	IB/mad: RMPP support for additional classes	2006-03-30 07:19:51 -08:00
rxrpc
scsi
sound	[PATCH] mark f_ops const in the inode	2006-03-28 09:16:05 -08:00
video