Merge commit 'v2.6.29-rc4' into core/percpu
authorIngo Molnar <mingo@elte.hu>
Mon, 9 Feb 2009 13:58:11 +0000 (14:58 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 9 Feb 2009 13:58:11 +0000 (14:58 +0100)
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
arch/x86/mm/fault.c


Trivial merge