kernel-fxtec-pro1x/arch/um
Rusty Russell 968ea6d80e Merge ../linux-2.6-x86
Conflicts:

	arch/x86/kernel/io_apic.c
	kernel/sched.c
	kernel/sched_stats.h
2008-12-13 21:55:51 +10:30
..
drivers uml: boot broken due to buffer overrun 2008-12-10 08:01:52 -08:00
include Merge commit 'v2.6.28-rc2' into core/locking 2008-10-28 16:54:49 +01:00
kernel cpumask: convert struct clock_event_device to cpumask pointers. 2008-12-13 21:20:26 +10:30
os-Linux x86, um: get rid of arch/um/os symlink 2008-10-22 22:55:22 -07:00
scripts uml: throw out CONFIG_MODE_TT 2007-10-16 09:43:05 -07:00
sys-i386 x86, um: get rid of excessive includes of uml-config.h 2008-10-22 22:55:22 -07:00
sys-ia64 x86, um: get rid of sysdep symlink 2008-10-22 22:55:21 -07:00
sys-ppc x86, um: get rid of header symlinks 2008-10-22 22:55:22 -07:00
sys-x86_64 x86: Fix ASM_X86__ header guards 2008-10-22 22:55:23 -07:00
defconfig UML: update defconfig 2008-02-23 17:12:13 -08:00
Kconfig.char sound: make OSS sound core optional 2008-08-29 10:06:21 +02:00
Kconfig.common x86, um: get rid of arch/um/Kconfig.arch 2008-10-22 22:55:23 -07:00
Kconfig.debug uml: GPROF needs to depend on FRAME_POINTER 2008-02-05 09:44:25 -08:00
Kconfig.net uml: fix URLs in Kconfig and help strings 2008-02-05 09:44:25 -08:00
Kconfig.rest x86, um: get rid of arch/um/Kconfig.arch 2008-10-22 22:55:23 -07:00
Kconfig.um x86, um: get rid of arch/um/Kconfig.arch 2008-10-22 22:55:23 -07:00
Kconfig.x86 x86, um: get rid of arch/um/Kconfig.arch 2008-10-22 22:55:23 -07:00
Makefile x86, um: get rid of uml-config.h 2008-10-22 22:55:23 -07:00
Makefile-i386 [UML] fix gcc ICEs and unresolved externs 2008-07-07 10:53:10 -07:00
Makefile-ia64
Makefile-os-Linux x86, um: get rid of arch/um/os symlink 2008-10-22 22:55:22 -07:00
Makefile-ppc
Makefile-skas
Makefile-x86_64 [UML] fix gcc ICEs and unresolved externs 2008-07-07 10:53:10 -07:00