Merge branch 'linus' into perfcounters/core

Conflicts:
	arch/x86/kernel/irqinit.c
	arch/x86/kernel/irqinit_64.c
	arch/x86/kernel/traps.c
	arch/x86/mm/fault.c
	include/linux/sched.h
	kernel/exit.c
This commit is contained in:
Ingo Molnar 2009-06-11 17:55:42 +02:00
commit 940010c5a3
449 changed files with 17775 additions and 8485 deletions

View file

@ -308,7 +308,7 @@ menu "RCU Subsystem"
choice
prompt "RCU Implementation"
default CLASSIC_RCU
default TREE_RCU
config CLASSIC_RCU
bool "Classic RCU"