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
..
asm	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
cpu-common/cpu	sh: Allow SH-3 and SH-5 to use common headers.	2008-07-29 22:52:49 +09:00
cpu-sh2/cpu	SH2(A) cache update	2008-08-04 16:33:47 +09:00
cpu-sh2a/cpu	sh: Move the CPU definition headers from asm/ to cpu/.	2008-10-20 12:04:53 +09:00
cpu-sh3/cpu	sh: Add platform-specific constants for SH7709	2008-12-22 18:42:54 +09:00
cpu-sh4/cpu	sh: Add on-chip RTC support for SH7722.	2008-10-28 18:40:19 +09:00
cpu-sh5/cpu	sh: Allow SH-3 and SH-5 to use common headers.	2008-07-29 22:52:49 +09:00
mach-common/mach	sh: mach-edosk7705: Fix up edosk7705 so it all builds again.	2008-12-22 18:44:45 +09:00
mach-dreamcast/mach	sh: More header path fixups for mach dir refactoring.	2008-07-29 22:10:01 +09:00
mach-landisk/mach
mach-se/mach	sh: mrshpc_setup_windows() needs to be inline.	2008-12-22 18:44:46 +09:00
mach-sh03/mach