Merge branch 'linus' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 09:11:42 +0000 (11:11 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 09:11:42 +0000 (11:11 +0200)
commitf34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d
tree0816c565d26ae24854616faa0d497be365c2fe8b
parentee4311adf105f4d740f52e3948acc1d81598afcc
parent481c5346d0981940ee63037eb53e4e37b0735c10
Merge branch 'linus' into tracing/ftrace
Makefile
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/ppc_ksyms.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
kernel/sched.c