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
..
boot
kernel	Manual merge with Linus.	2006-04-02 00:08:05 -05:00
lib	[PATCH] bitops: alpha: use config options instead of __alpha_fix__ and __alpha_cix__	2006-03-26 08:57:09 -08:00
math-emu
mm	[PATCH] unify PFN_* macros	2006-03-27 08:44:48 -08:00
oprofile	[PATCH] alpha gcc4 warnings	2005-08-23 18:43:43 -07:00
defconfig	[PATCH] update all defconfigs for ARCH_DISCONTIGMEM_ENABLE	2005-06-23 09:45:02 -07:00
Kconfig	[PATCH] bitops: alpha: use generic bitops	2006-03-26 08:57:11 -08:00
Kconfig.debug
Makefile	kbuild: alpha,x86_64 use generic asm-offsets.h support	2005-09-09 21:28:48 +02:00