Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts: arch/x86/kernel/io_apic.c
2026-09-26 18:16:26 +00:00 · 2008-12-31 23:05:57 +10:30 · 2008-12-31 23:05:57 +10:30 · 2ca1a61583
commit 2ca1a61583
parent e12f0102ac 6a94cb7306
2303 changed files with 216724 additions and 122834 deletions
--- a/kernel/Kconfig.preempt
+++ b/kernel/Kconfig.preempt
--- a/kernel/Makefile
+++ b/kernel/Makefile
--- a/kernel/exit.c
+++ b/kernel/exit.c
--- a/kernel/extable.c
+++ b/kernel/extable.c
--- a/kernel/fork.c
+++ b/kernel/fork.c
--- a/kernel/futex.c
+++ b/kernel/futex.c
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
--- a/kernel/irq/Makefile
+++ b/kernel/irq/Makefile
--- a/kernel/irq/autoprobe.c
+++ b/kernel/irq/autoprobe.c
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
--- a/kernel/irq/numa_migrate.c
+++ b/kernel/irq/numa_migrate.c
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
--- a/kernel/lockdep_proc.c
+++ b/kernel/lockdep_proc.c
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
--- a/kernel/notifier.c
+++ b/kernel/notifier.c
--- a/kernel/panic.c
+++ b/kernel/panic.c
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
--- a/kernel/printk.c
+++ b/kernel/printk.c
--- a/kernel/rcuclassic.c
+++ b/kernel/rcuclassic.c
--- a/kernel/rcupreempt.c
+++ b/kernel/rcupreempt.c
--- a/kernel/rcupreempt_trace.c
+++ b/kernel/rcupreempt_trace.c
--- a/kernel/rcutorture.c
+++ b/kernel/rcutorture.c
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
--- a/kernel/rcutree_trace.c
+++ b/kernel/rcutree_trace.c
--- a/kernel/resource.c
+++ b/kernel/resource.c
--- a/kernel/sched.c
+++ b/kernel/sched.c
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
--- a/kernel/stacktrace.c
+++ b/kernel/stacktrace.c
--- a/kernel/sys.c
+++ b/kernel/sys.c
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
--- a/kernel/sysctl_check.c
+++ b/kernel/sysctl_check.c
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
--- a/kernel/trace/trace_sysprof.c
+++ b/kernel/trace/trace_sysprof.c