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
..
alpha	Manual merge with Linus.	2006-04-02 00:08:05 -05:00
arm	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2006-03-31 21:33:07 -08:00
arm26	[PATCH] unexport get_wchan	2006-03-31 12:19:01 -08:00
cris	[PATCH] unify PFN_* macros	2006-03-27 08:44:48 -08:00
frv	[PATCH] unexport get_wchan	2006-03-31 12:19:01 -08:00
h8300	[PATCH] unexport get_wchan	2006-03-31 12:19:01 -08:00
i386	Manual merge with Linus.	2006-04-02 00:08:05 -05:00
ia64	[IA64] Avoid "u64 foo : 32;" for gcc3 vs. gcc4 compatibility	2006-03-31 10:28:29 -08:00
m32r	[PATCH] unify PFN_* macros	2006-03-27 08:44:48 -08:00
m68k	[PATCH] unexport get_wchan	2006-03-31 12:19:01 -08:00
m68knommu	[PATCH] unexport get_wchan	2006-03-31 12:19:01 -08:00
mips	Manual merge with Linus.	2006-04-02 00:08:05 -05:00
parisc	[PARISC] Enabled some NLS modules in a500, b180 and c3000 defconfigs	2006-03-30 17:48:58 +00:00
powerpc	Manual merge with Linus.	2006-04-02 00:08:05 -05:00
ppc	[PATCH] for_each_possible_cpu: ppc	2006-03-29 13:44:16 +11:00
s390	[PATCH] for_each_possible_cpu: s390	2006-03-31 12:18:52 -08:00
sh	[PATCH] Don't pass boot parameters to argv_init[]	2006-03-31 12:18:53 -08:00
sh64	[PATCH] RTC: Remove some duplicate BCD definitions	2006-03-28 09:16:01 -08:00
sparc	[PATCH] bitops: sparc: use generic bitops	2006-03-26 08:57:14 -08:00
sparc64	[PATCH] RTC: Remove RTC UIP synchronization on Sparc64	2006-03-28 09:16:00 -08:00
um	[PATCH] uml: check for differences in host support	2006-03-31 12:18:52 -08:00
v850	[PATCH] bitops: v850: use generic bitops	2006-03-26 08:57:14 -08:00
x86_64	[PATCH] unexport get_wchan	2006-03-31 12:19:01 -08:00
xtensa	[PATCH] unexport get_wchan	2006-03-31 12:19:01 -08:00