From: Mike Travis <travis@sgi.com>
Date: Thu, 1 Jan 2009 01:34:16 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux... 
X-Git-Tag: v2.6.29-rc1~521^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eb19553369c46cc1fa64caf120cbcab1b597f7c;p=pandora-kernel.git

Merge branch 'master' of git://git./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>
---

7eb19553369c46cc1fa64caf120cbcab1b597f7c
Reading git-diff-tree failed