Ingo Molnar 1a781a777b Merge branch 'generic-ipi' into generic-ipi-for-linus ... Conflicts: arch/powerpc/Kconfig arch/s390/kernel/time.c arch/x86/kernel/apic_32.c arch/x86/kernel/cpu/perfctr-watchdog.c arch/x86/kernel/i8259_64.c arch/x86/kernel/ldt.c arch/x86/kernel/nmi_64.c arch/x86/kernel/smpboot.c arch/x86/xen/smp.c include/asm-x86/hw_irq_32.h include/asm-x86/hw_irq_64.h include/asm-x86/mach-default/irq_vectors.h include/asm-x86/mach-voyager/irq_vectors.h include/asm-x86/smp.h kernel/Makefile Signed-off-by: Ingo Molnar <mingo@elte.hu>		2008-07-15 21:55:59 +02:00
..
drivers	Merge commit 'v2.6.26' into bkl-removal	2008-07-14 15:29:34 -06:00
include	uml: deal with inaccessible address space start	2008-06-06 11:29:10 -07:00
kernel	smp_call_function: get rid of the unused nonatomic/retry argument	2008-06-26 11:24:35 +02:00
os-Linux	uml: work around broken host PTRACE_SYSEMU	2008-06-12 18:05:40 -07:00
scripts
sys-i386	uml: tidy ptrace interface	2008-05-13 08:02:21 -07:00
sys-ia64
sys-ppc
sys-x86_64	uml: memcpy export needs to follow host declaration	2008-06-06 11:29:10 -07:00
defconfig
Kconfig	thanks to net/mac80211 we need to pull drivers/leds/Kconfig on uml	2008-05-21 16:55:58 -07:00
Kconfig.char	uml: fix CONFIG_RAW dependencies	2008-05-13 08:02:22 -07:00
Kconfig.debug
Kconfig.i386	x86, bitops: select the generic bitmap search functions	2008-04-26 19:21:17 +02:00
Kconfig.net
Kconfig.x86_64	x86, bitops: select the generic bitmap search functions	2008-04-26 19:21:17 +02:00
Makefile	[UML] fix gcc ICEs and unresolved externs	2008-07-07 10:53:10 -07:00
Makefile-i386	[UML] fix gcc ICEs and unresolved externs	2008-07-07 10:53:10 -07:00
Makefile-ia64
Makefile-os-Linux
Makefile-ppc
Makefile-skas
Makefile-x86_64	[UML] fix gcc ICEs and unresolved externs	2008-07-07 10:53:10 -07:00