Mike Travis 7eb1955336 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask ... Conflicts: arch/x86/kernel/io_apic.c kernel/rcuclassic.c kernel/sched.c kernel/time/tick-sched.c Signed-off-by: Mike Travis <travis@sgi.com> [ mingo@elte.hu: backmerged typo fix for io_apic.c ] Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-01-03 18:53:31 +01:00
..
boards	sh: mach-sh03: Fix up pata_platform build breakage.	2008-12-22 18:44:49 +09:00
boot	sh: FTRACE renamed to FUNCTION_TRACER.	2008-10-31 16:20:36 +09:00
cchips	sh: Switch HD64461 from hw_interrupt_type to irq_chip	2008-12-22 18:43:50 +09:00
configs	sh: Add a simple edosk7705_defconfig for build testing.	2008-12-22 18:44:46 +09:00
drivers	sh: dma: Kill off ISA DMA wrapper.	2008-12-22 18:44:47 +09:00
include	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask	2009-01-03 18:53:31 +01:00
kernel	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-12-30 08:02:35 +10:30
lib	sh: Add plain udivsi3 (not _i4*) for gcc-4.1 and lower.	2008-12-22 18:43:53 +09:00
lib64	sh: Provide sdivsi3/udivsi3/udivdi3 for sh64, kill off libgcc linking.	2008-12-22 18:44:05 +09:00
math-emu	sh: Fix up the math-emu build.	2007-06-11 15:57:42 +09:00
mm	sh: split coherent pages	2008-12-22 18:44:48 +09:00
oprofile	sh: oprofile: Fix up the module build.	2008-12-22 19:32:27 +09:00
tools	sh: Consolidate rsk7203/7201 in to a new mach-rsk.	2008-12-22 18:44:02 +09:00
Kconfig	sh: dma: Kill off ISA DMA wrapper.	2008-12-22 18:44:47 +09:00
Kconfig.cpu	sh: Disable big endian for SH-5.	2008-02-14 14:22:10 +09:00
Kconfig.debug	sh: Conditionalize the code dumper on CONFIG_DUMP_CODE.	2008-12-22 18:44:47 +09:00
Makefile	sh: mach-rsk: Use uImage generation by default for rsk7201/7203.	2008-12-22 18:44:49 +09:00