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
..
boards	Merge commit 'v2.6.26' into bkl-removal	2008-07-14 15:29:34 -06:00
boot	sh: remove -traditional.	2008-05-08 19:51:46 +09:00
cchips	sh: Kill off more dead symbols.	2008-02-14 14:22:12 +09:00
configs	Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap-reviewed', 'rpc', 'rtc' and 's3c' into devel	2008-07-10 16:38:50 +01:00
drivers	MODULE_LICENSE expects "GPL v2", not "GPLv2"	2008-05-21 16:56:00 -07:00
kernel	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
lib	sh: Fix up optimized SH-4 memcpy on big endian.	2008-05-16 14:55:07 +09:00
lib64	sh64: Fix up compile warning in event tracer.	2008-05-08 19:51:37 +09:00
math-emu	sh: Fix up the math-emu build.	2007-06-11 15:57:42 +09:00
mm	sh: add memory resources to /proc/iomem	2008-05-08 19:51:51 +09:00
oprofile	sh: Add -Werror for clean directories.	2007-11-07 11:13:55 +09:00
tools	sh: remove the broken SH_MPC1211 support	2008-05-08 19:51:39 +09:00
Kconfig	sh: convert to generic helpers for IPI function calls	2008-06-26 11:22:58 +02:00
Kconfig.cpu	sh: Disable big endian for SH-5.	2008-02-14 14:22:10 +09:00
Kconfig.debug	sh: Disable 4KSTACKS on nommu.	2008-06-02 13:48:59 +09:00
Makefile	sh: Add -mno-fdpic to default flags.	2008-06-09 16:49:43 +09:00