Merge branch 'master' of...
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>
Too many changes to show.
To preserve performance only 20 of 1000+ files are displayed.
Documentation/RCU/trace.txt
0 → 100644