| commit | 7eb19553369c46cc1fa64caf120cbcab1b597f7c | [log] [tgz] |
|---|---|---|
| author | Mike Travis <travis@sgi.com> | Wed Dec 31 17:34:16 2008 -0800 |
| committer | Ingo Molnar <mingo@elte.hu> | Sat Jan 03 18:53:31 2009 +0100 |
| tree | ef1a3beae706b9497c845d0a2557ceb4d2754998 | |
| parent | 6092848a2a23b660150a38bc06f59d75838d70c8 [diff] | |
| parent | 8c384cdee3e04d6194a2c2b192b624754f990835 [diff] |
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>