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	[PATCH] fbdev: Make BIOS EDID reading configurable	2006-03-27 08:44:55 -08:00
crypto	[CRYPTO] aes-i586: Remove unused variable ls_tab	2006-01-09 14:15:53 -08:00
kernel	Manual merge with Linus.	2006-04-02 00:08:05 -05:00
lib	[LIB]: Consolidate _atomic_dec_and_lock()	2005-09-14 21:47:01 -07:00
mach-default	[PATCH] Fix topology.c location	2006-02-24 14:31:39 -08:00
mach-es7000	[PATCH] Compilation fix for ES7000 when no ACPI is specified in config (i386)	2006-03-23 07:38:04 -08:00
mach-generic	[PATCH] x86: sutomatically enable bigsmp when we have more than 8 CPUs	2005-09-05 00:06:10 -07:00
mach-visws	[PATCH] kill include/linux/platform.h, default_idle() cleanup	2006-03-24 07:33:21 -08:00
mach-voyager	[PATCH] for_each_possible_cpu: i386	2006-03-28 09:16:05 -08:00
math-emu	[PATCH] i386: inline assembler: cleanup and encapsulate descriptor and task register management	2005-09-05 00:06:11 -07:00
mm	[PATCH] unify PFN_* macros	2006-03-27 08:44:48 -08:00
oprofile	[PATCH] for_each_possible_cpu: i386	2006-03-28 09:16:05 -08:00
pci	[PATCH] PCI: PCI/Cardbus cards hidden, needs pci=assign-busses to fix	2006-03-23 14:35:14 -08:00
power	[PATCH] x86: add MCE resume	2005-11-07 07:53:30 -08:00
Kconfig	[PATCH] sched: new sched domain for representing multi-core	2006-03-27 08:44:43 -08:00
Kconfig.cpu	[PATCH] Base support for AMD Geode GX/LX processors	2006-01-06 08:33:38 -08:00
Kconfig.debug	[PATCH] kconfig: clarify memory debug options	2006-03-25 08:22:54 -08:00
Makefile	[PATCH] x86: "make isoimage" support; FDINITRD= support; minor cleanups	2006-03-26 08:56:53 -08:00
Makefile.cpu	[PATCH] x86-64: Use -mtune=generic for generic kernels	2006-03-25 09:10:52 -08:00
defconfig	update the i386 defconfig	2006-03-20 20:14:06 +01:00