Merge branch 'linus' into sched/core

Conflicts:
	kernel/Makefile
This commit is contained in:
Ingo Molnar
2008-11-19 09:44:37 +01:00
631 changed files with 19904 additions and 6511 deletions
-2
View File
@@ -11,8 +11,6 @@ obj-y = sched.o fork.o exec_domain.o panic.o printk.o \
hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \
notifier.o ksysfs.o pm_qos_params.o sched_clock.o
CFLAGS_REMOVE_sched.o = -mno-spe
ifdef CONFIG_FUNCTION_TRACER
# Do not trace debug files and internal ftrace files
CFLAGS_REMOVE_lockdep.o = -pg