Merge branch 'linus' into sched/core
authorIngo Molnar <mingo@elte.hu>
Wed, 19 Nov 2008 08:44:37 +0000 (09:44 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 19 Nov 2008 08:44:37 +0000 (09:44 +0100)
commit3ac3ba0b396fd99550e08034b0e4c27fdf39c252
treef9f69fac41d66540a37a33808714d055d702328f
parent934352f214b3251eb0793c1209d346595a661d80
parent7f0f598a0069d1ab072375965a4b69137233169c
Merge branch 'linus' into sched/core

Conflicts:
kernel/Makefile
arch/ia64/Kconfig
arch/x86/Kconfig
kernel/Makefile
kernel/sched.c
kernel/sched_debug.c