tree ef1a3beae706b9497c845d0a2557ceb4d2754998
parent 6092848a2a23b660150a38bc06f59d75838d70c8
parent 8c384cdee3e04d6194a2c2b192b624754f990835
author Mike Travis <travis@sgi.com> 1230773656 -0800
committer Ingo Molnar <mingo@elte.hu> 1231005211 +0100

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>